Rename TestWebKitAPI/Tests/WebKit2* to WebKit* following Source directory rename.

Rubber-stamped by Brady Eidson.

* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKit2Cocoa: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLs.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLsPlugin.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLsProtocol.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AllAhem.svg: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AlwaysRevalidatedURLSchemes.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ApplicationCache.db: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ApplicationCache.db-shm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ApplicationCache.db-wal: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegate.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegatePlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegateProtocol.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleParameters.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleParametersPlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandle.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandlePlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandleProtocol.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresource.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresourcePlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/CookieMessage.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/Copying.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DecidePolicyForNavigationAction.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestOriginalURL.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestOriginalURL2.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestOriginalURLFrame.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/DuplicateCompletionHandlerCalls.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/EditorStateTests.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/EmptyGrandfatheredResourceLoadStatistics.plist: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FixedLayoutSize.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/Geolocation.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/GeolocationGetCurrentPositionResult.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.sqlite3: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.sqlite3-shm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.sqlite3-wal: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IconLoadingDelegate.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexUpgrade.blob: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexUpgrade.sqlite3: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill-1.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-3.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence-1.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence-2.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBStructuredCloneBackwardCompatibility.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBStructuredCloneBackwardCompatibility.sqlite3: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBStructuredCloneBackwardCompatibility.sqlite3-shm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBStructuredCloneBackwardCompatibility.sqlite3-wal: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBStructuredCloneBackwardCompatibilityRead.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBStructuredCloneBackwardCompatibilityWrite.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/InitialWarmedProcessUsed.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/InteractionDeadlockAfterCrash.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LineBreaking.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LoadAlternateHTMLString.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage-shm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageQuirkEnabled.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageQuirkTest.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ModalAlerts.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/NowPlayingControlsTests.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ObservedRenderingProgressEventsAfterCrash.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/OpenAndCloseWindow.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/OverrideContentSecurityPolicy.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/PictureInPictureDelegate.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/PictureInPictureDelegate.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/PluginLoadClientPolicies.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/Preferences.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/PrepareForMoveToWindow.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ProvisionalURLNotChange.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistry.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistry.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistryPlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptions.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptionsPlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptionsProtocol.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/RunOpenPanel.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/ShrinkToFit.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/SnapshotStore.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobToBeDeleted.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UIDelegate.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorld.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorldPlugIn.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorldProtocol.h: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/UserMediaDisabled.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/VisibleContentRect.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKContentExtensionStore.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKContentViewEditingActions.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKHTTPCookieStore.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKPDFView.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKPDFViewResizeCrash.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKPDFViewStablePresentationUpdateCallback.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKRequestActivatedElementInfo.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKURLSchemeHandler-1.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKURLSchemeHandler-leaks.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewDefaultNavigationDelegate.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewDiagnosticLogging.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewDoesNotLogDuringInitialization.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewGetContents.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewSnapshot.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewTextInput.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-1.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-2.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/apple.gif: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/attachment-element.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/autofocus-contenteditable.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/autofocused-text-input.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/autoplaying-video-with-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/background-image-link-and-input.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/blinking-div.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/change-video-source-on-click.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/change-video-source-on-end.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/compressed-files.zip: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/contenteditable-and-target.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/contenteditable-and-textarea.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/contenteditable-in-iframe.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/disableGetUserMedia.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/div-and-large-image.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/double-click-does-not-select-trailing-space.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/dragstart-change-selection-offscreen.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/dragstart-clear-selection.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/duplicate-completion-handler-calls.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/editable-body.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/editor-state-test-harness.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/enormous-video-with-sound.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/enormous.svg: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/file-uploading.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/focus-inputs.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/full-size-autoplaying-video-with-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/gif-and-file-input.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/image-and-contenteditable.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/image-and-textarea.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/image-in-link-and-input.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/image-map.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/input-field-in-scrollable-document.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-input-field-focus-onload.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-red-square.png: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-hides-controls-after-seek-to-end.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-mutes-onplaying.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-offscreen.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-playing-scroll-away.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-seek-after-ending.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-seek-to-beginning-and-play-after-ending.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-test-now-playing.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-with-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-with-audio.mp4: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-video-without-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-autoplaying-click-to-pause.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-autoplaying-scroll-to-video.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-paused-video-hides-controls.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-playing-muted-video-hides-controls.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-playing-video-keeps-controls.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-with-audio-autoplay.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/large-videos-with-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/link-and-input.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/link-and-target-div.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/offscreen-iframe-of-media-document.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/open-multiple-external-url.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/page-with-csp-iframe.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/page-with-csp.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/page-without-csp-iframe.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/page-without-csp.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/password-protected.pages: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/play-audio-on-click.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/prevent-operation.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/prevent-start.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/rendered-image-excluding-overflow.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/rich-and-plain-text.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/silence-long.m4a: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/skinny-autoplaying-video-with-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/text-and-password-inputs.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/textarea-to-input.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/two-paragraph-contenteditable.html: Removed.
* TestWebKitAPI/Tests/WebKit2Cocoa/wide-autoplaying-video-with-audio.html: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/AutocleanupsTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMClientRectTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/EditorTest.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestAutocleanups.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMClientRect.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNodeFilter.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMXPathNSResolver.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestEditor.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestOptionMenu.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm: Removed.
* TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm: Removed.
* TestWebKitAPI/Tests/WebKitCocoa: Copied from TestWebKitAPI/Tests/WebKit2Cocoa.
* TestWebKitAPI/Tests/WebKitGtk: Copied from TestWebKitAPI/Tests/WebKit2Gtk.
* TestWebKitAPI/Tests/WebKitObjC: Copied from TestWebKitAPI/Tests/WebKit2ObjC.
* TestWebKitAPI/glib/PlatformGTK.cmake:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@221219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Tools/ChangeLog

@@ -1,8 +1,8 @@
 set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
 set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
 
-# This is necessary because it is possible to build TestWebKitAPI with WebKit2
-# disabled and this triggers the inclusion of the WebKit2 headers.
+# This is necessary because it is possible to build TestWebKitAPI with WebKit
+# disabled and this triggers the inclusion of the WebKit headers.
 add_definitions(-DBUILDING_WEBKIT2__)
 
 add_custom_target(TestWebKitAPI-forwarding-headers

Tools/TestWebKitAPI/PlatformGTK.cmake

@@ -1074,10 +1074,10 @@
 		290F4274172A1FDE00939FF0 /* custom-protocol-sync-xhr.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "custom-protocol-sync-xhr.html"; sourceTree = "<group>"; };
 		290F4276172A232C00939FF0 /* CustomProtocolsSyncXHRTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomProtocolsSyncXHRTest.mm; sourceTree = "<group>"; };
 		291861FD17BD4DC700D4E41E /* StopLoadingFromDidFinishLoading.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StopLoadingFromDidFinishLoading.mm; sourceTree = "<group>"; };
-		2943BE84161DFEB800999E3D /* UserContentTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = UserContentTest.mm; path = WebKit2ObjC/UserContentTest.mm; sourceTree = "<group>"; };
-		297234B2173AD04800983601 /* CustomProtocolsInvalidScheme.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolsInvalidScheme.mm; path = WebKit2ObjC/CustomProtocolsInvalidScheme.mm; sourceTree = "<group>"; };
-		297234B5173AFAC700983601 /* CustomProtocolsInvalidScheme_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CustomProtocolsInvalidScheme_Bundle.cpp; path = WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp; sourceTree = "<group>"; };
-		29AB8A9F164C735800D49BEC /* CustomProtocolsTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolsTest.mm; path = WebKit2ObjC/CustomProtocolsTest.mm; sourceTree = "<group>"; };
+		2943BE84161DFEB800999E3D /* UserContentTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = UserContentTest.mm; path = WebKitObjC/UserContentTest.mm; sourceTree = "<group>"; };
+		297234B2173AD04800983601 /* CustomProtocolsInvalidScheme.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolsInvalidScheme.mm; path = WebKitObjC/CustomProtocolsInvalidScheme.mm; sourceTree = "<group>"; };
+		297234B5173AFAC700983601 /* CustomProtocolsInvalidScheme_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CustomProtocolsInvalidScheme_Bundle.cpp; path = WebKitObjC/CustomProtocolsInvalidScheme_Bundle.cpp; sourceTree = "<group>"; };
+		29AB8A9F164C735800D49BEC /* CustomProtocolsTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolsTest.mm; path = WebKitObjC/CustomProtocolsTest.mm; sourceTree = "<group>"; };
 		29AB8AA2164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestBrowsingContextLoadDelegate.mm; sourceTree = "<group>"; };
 		29AB8AA3164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestBrowsingContextLoadDelegate.h; sourceTree = "<group>"; };
 		2D00065D1C1F58940088E6A7 /* WKPDFViewResizeCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPDFViewResizeCrash.mm; sourceTree = "<group>"; };
@@ -1506,8 +1506,8 @@
 		AD57AC1F1DA7464D00FF1BDE /* DidRemoveFrameFromHiearchyInPageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DidRemoveFrameFromHiearchyInPageCache.cpp; sourceTree = "<group>"; };
 		AD7C434C1DD2A5470026888B /* Expected.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Expected.cpp; sourceTree = "<group>"; };
 		B4039F9C15E6D8B3007255D6 /* MathExtras.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathExtras.cpp; sourceTree = "<group>"; };
-		B55AD1D1179F336600AC1494 /* PreventImageLoadWithAutoResizing.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = PreventImageLoadWithAutoResizing.mm; path = WebKit2ObjC/PreventImageLoadWithAutoResizing.mm; sourceTree = "<group>"; };
-		B55AD1D3179F3ABF00AC1494 /* PreventImageLoadWithAutoResizing_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PreventImageLoadWithAutoResizing_Bundle.cpp; path = WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp; sourceTree = "<group>"; };
+		B55AD1D1179F336600AC1494 /* PreventImageLoadWithAutoResizing.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = PreventImageLoadWithAutoResizing.mm; path = WebKitObjC/PreventImageLoadWithAutoResizing.mm; sourceTree = "<group>"; };
+		B55AD1D3179F3ABF00AC1494 /* PreventImageLoadWithAutoResizing_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PreventImageLoadWithAutoResizing_Bundle.cpp; path = WebKitObjC/PreventImageLoadWithAutoResizing_Bundle.cpp; sourceTree = "<group>"; };
 		B55F119F1516834F00915916 /* AttributedString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AttributedString.mm; sourceTree = "<group>"; };
 		B55F11B01517A2C400915916 /* attributedStringCustomFont.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = attributedStringCustomFont.html; sourceTree = "<group>"; };
 		BC029B161486AD6400817DA9 /* RetainPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RetainPtr.cpp; sourceTree = "<group>"; };
@@ -1523,8 +1523,8 @@
 		BC246D98132F1FE100B56D7C /* CanHandleRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanHandleRequest.cpp; sourceTree = "<group>"; };
 		BC2D004812A9FDFA00E732A3 /* PageLoadDidChangeLocationWithinPageForFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageLoadDidChangeLocationWithinPageForFrame.cpp; sourceTree = "<group>"; };
 		BC2D004A12A9FEB300E732A3 /* file-with-anchor.html */ = {isa = PBXFileReference; explicitFileType = text.html; fileEncoding = 4; path = "file-with-anchor.html"; sourceTree = "<group>"; };
-		BC3C4C7014575B6A0025FB62 /* WKBrowsingContextLoadDelegateTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBrowsingContextLoadDelegateTest.mm; path = WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm; sourceTree = "<group>"; };
-		BC3C4C7D14587AA60025FB62 /* WKBrowsingContextGroupTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBrowsingContextGroupTest.mm; path = WebKit2ObjC/WKBrowsingContextGroupTest.mm; sourceTree = "<group>"; };
+		BC3C4C7014575B6A0025FB62 /* WKBrowsingContextLoadDelegateTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBrowsingContextLoadDelegateTest.mm; path = WebKitObjC/WKBrowsingContextLoadDelegateTest.mm; sourceTree = "<group>"; };
+		BC3C4C7D14587AA60025FB62 /* WKBrowsingContextGroupTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBrowsingContextGroupTest.mm; path = WebKitObjC/WKBrowsingContextGroupTest.mm; sourceTree = "<group>"; };
 		BC55F5F814AD78EE00484BE1 /* Vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector.cpp; sourceTree = "<group>"; };
 		BC575946126E7351006F0F12 /* InjectedBundleMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleMain.cpp; sourceTree = "<group>"; };
 		BC575980126E74AF006F0F12 /* InjectedBundleTestWebKitAPI.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InjectedBundleTestWebKitAPI.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1687,7 +1687,7 @@
 		F41AB99C1EF4692C0083FA08 /* contenteditable-and-textarea.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "contenteditable-and-textarea.html"; sourceTree = "<group>"; };
 		F41AB99D1EF4692C0083FA08 /* link-and-target-div.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "link-and-target-div.html"; sourceTree = "<group>"; };
 		F41AB99E1EF4692C0083FA08 /* div-and-large-image.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "div-and-large-image.html"; sourceTree = "<group>"; };
-		F42DA5151D8CEFDB00336F40 /* large-input-field-focus-onload.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "large-input-field-focus-onload.html"; path = "Tests/WebKit2Cocoa/large-input-field-focus-onload.html"; sourceTree = SOURCE_ROOT; };
+		F42DA5151D8CEFDB00336F40 /* large-input-field-focus-onload.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "large-input-field-focus-onload.html"; path = "Tests/WebKitCocoa/large-input-field-focus-onload.html"; sourceTree = SOURCE_ROOT; };
 		F4451C751EB8FD7C0020C5DA /* two-paragraph-contenteditable.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "two-paragraph-contenteditable.html"; sourceTree = "<group>"; };
 		F44D06441F395C0D001A0E29 /* editor-state-test-harness.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "editor-state-test-harness.html"; sourceTree = "<group>"; };
 		F44D06461F395C4D001A0E29 /* EditorStateTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorStateTests.mm; sourceTree = "<group>"; };
@@ -1718,7 +1718,7 @@
 		F4F405BA1D4C0CF8007A9707 /* full-size-autoplaying-video-with-audio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "full-size-autoplaying-video-with-audio.html"; sourceTree = "<group>"; };
 		F4F405BB1D4C0CF8007A9707 /* skinny-autoplaying-video-with-audio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "skinny-autoplaying-video-with-audio.html"; sourceTree = "<group>"; };
 		F4FA917F1E61849B007B8C1D /* WKWebViewMacEditingTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewMacEditingTests.mm; sourceTree = "<group>"; };
-		F4FA91821E618566007B8C1D /* double-click-does-not-select-trailing-space.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "double-click-does-not-select-trailing-space.html"; path = "Tests/WebKit2Cocoa/double-click-does-not-select-trailing-space.html"; sourceTree = SOURCE_ROOT; };
+		F4FA91821E618566007B8C1D /* double-click-does-not-select-trailing-space.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "double-click-does-not-select-trailing-space.html"; path = "Tests/WebKitCocoa/double-click-does-not-select-trailing-space.html"; sourceTree = SOURCE_ROOT; };
 		F660AA0C15A5F061003A1243 /* GetInjectedBundleInitializationUserDataCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetInjectedBundleInitializationUserDataCallback.cpp; sourceTree = "<group>"; };
 		F660AA0F15A5F624003A1243 /* GetInjectedBundleInitializationUserDataCallback_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetInjectedBundleInitializationUserDataCallback_Bundle.cpp; sourceTree = "<group>"; };
 		F660AA1215A619C8003A1243 /* InjectedBundleInitializationUserDataCallbackWins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleInitializationUserDataCallbackWins.cpp; sourceTree = "<group>"; };
@@ -1872,7 +1872,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		1ABC3DEC1899BE55004F0626 /* WebKit2 Cocoa */ = {
+		1ABC3DEC1899BE55004F0626 /* WebKit Cocoa */ = {
 			isa = PBXGroup;
 			children = (
 				A16F66B81C40E9E100BD4D24 /* Resources */,
@@ -1988,8 +1988,8 @@
 				93F56DA81E5F9181003EDE84 /* WKWebViewSnapshot.mm */,
 				9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */,
 			);
-			name = "WebKit2 Cocoa";
-			path = WebKit2Cocoa;
+			name = "WebKit Cocoa";
+			path = WebKitCocoa;
 			sourceTree = "<group>";
 		};
 		2E9660DC16C07D7B00371B42 /* ios */ = {
@@ -2257,7 +2257,7 @@
 			name = ns;
 			sourceTree = "<group>";
 		};
-		BC3C4C6F14575B1D0025FB62 /* WebKit2 Objective-C */ = {
+		BC3C4C6F14575B1D0025FB62 /* WebKit Objective-C */ = {
 			isa = PBXGroup;
 			children = (
 				297234B2173AD04800983601 /* CustomProtocolsInvalidScheme.mm */,
@@ -2273,7 +2273,7 @@
 				BC3C4C7014575B6A0025FB62 /* WKBrowsingContextLoadDelegateTest.mm */,
 				2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */,
 			);
-			name = "WebKit2 Objective-C";
+			name = "WebKit Objective-C";
 			sourceTree = "<group>";
 		};
 		BC575944126E733C006F0F12 /* InjectedBundle */ = {
@@ -2609,8 +2609,8 @@
 				440A1D3614A01000008A66F2 /* WebCore */,
 				CDC8E4981BC728AE00594FEC /* WebKitLegacy */,
 				BC9096411255616000083756 /* WebKit */,
-				1ABC3DEC1899BE55004F0626 /* WebKit2 Cocoa */,
-				BC3C4C6F14575B1D0025FB62 /* WebKit2 Objective-C */,
+				1ABC3DEC1899BE55004F0626 /* WebKit Cocoa */,
+				BC3C4C6F14575B1D0025FB62 /* WebKit Objective-C */,
 				BC9096461255618900083756 /* WTF */,
 			);
 			path = Tests;

Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -24,30 +24,30 @@ list(APPEND WebKitGLibAPITest_LIBRARIES
 )
 
 list(APPEND WebKitGLibAPIWebProcessTests
-    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/AutocleanupsTest.cpp
-    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/DOMClientRectTest.cpp
-    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp
-    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp
-    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp
-    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/EditorTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/AutocleanupsTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/DOMClientRectTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/DOMNodeTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/DOMNodeFilterTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/DOMXPathNSResolverTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/EditorTest.cpp
 )
 
-ADD_WK2_TEST(InspectorTestServer ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp)
-ADD_WK2_TEST(TestAutocleanups ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestAutocleanups.cpp)
-ADD_WK2_TEST(TestContextMenu ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp)
-ADD_WK2_TEST(TestDOMClientRect ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMClientRect.cpp)
-ADD_WK2_TEST(TestDOMNode ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp)
-ADD_WK2_TEST(TestDOMNodeFilter ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNodeFilter.cpp)
-ADD_WK2_TEST(TestDOMXPathNSResolver ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMXPathNSResolver.cpp)
-ADD_WK2_TEST(TestEditor ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestEditor.cpp)
-ADD_WK2_TEST(TestInspector ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp)
-ADD_WK2_TEST(TestInspectorServer ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp)
-ADD_WK2_TEST(TestOptionMenu ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestOptionMenu.cpp)
-ADD_WK2_TEST(TestPrinting ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp)
-ADD_WK2_TEST(TestWebKitVersion ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp)
-ADD_WK2_TEST(TestWebViewEditor ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp)
+ADD_WK2_TEST(InspectorTestServer ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp)
+ADD_WK2_TEST(TestAutocleanups ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestAutocleanups.cpp)
+ADD_WK2_TEST(TestContextMenu ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp)
+ADD_WK2_TEST(TestDOMClientRect ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestDOMClientRect.cpp)
+ADD_WK2_TEST(TestDOMNode ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestDOMNode.cpp)
+ADD_WK2_TEST(TestDOMNodeFilter ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestDOMNodeFilter.cpp)
+ADD_WK2_TEST(TestDOMXPathNSResolver ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestDOMXPathNSResolver.cpp)
+ADD_WK2_TEST(TestEditor ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestEditor.cpp)
+ADD_WK2_TEST(TestInspector ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp)
+ADD_WK2_TEST(TestInspectorServer ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestInspectorServer.cpp)
+ADD_WK2_TEST(TestOptionMenu ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestOptionMenu.cpp)
+ADD_WK2_TEST(TestPrinting ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp)
+ADD_WK2_TEST(TestWebKitVersion ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestWebKitVersion.cpp)
+ADD_WK2_TEST(TestWebViewEditor ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp)
 
 if (ATSPI_FOUND)
-    ADD_WK2_TEST(AccessibilityTestServer ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp)
-    ADD_WK2_TEST(TestWebKitAccessibility ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp)
+    ADD_WK2_TEST(AccessibilityTestServer ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/AccessibilityTestServer.cpp)
+    ADD_WK2_TEST(TestWebKitAccessibility ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp)
 endif ()