Move source files from webkit/support to content/test

BUG=265753
TEST=content_unittests, webkit_unit_tests, content_shell
R=jamesr@chromium.org,tkent@chromium.org,jochen@chromium.org

Review URL: https://chromiumcodereview.appspot.com/23526028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223201 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 106 insertions, 172 deletions

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 85a88c4..233a7c4 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -51,8 +51,10 @@
         '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/support/webkit_support.gyp:webkit_support',
+        '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '../webkit/support/webkit_support.gyp:glue',
       ],
       'include_dirs': [
         '..',
@@ -203,7 +205,7 @@
           'dependencies': [
             # This dependency is for running DRT against the content shell, and
             # this combination is not yet supported on Android.
-            '../webkit/support/webkit_support.gyp:webkit_support',
+            'test_support_content',
           ],
         }],  # OS=="android"
         ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_use_tcmalloc==1)', {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index c315ecf..073982c 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -13,6 +13,7 @@
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
@@ -114,6 +115,10 @@
         'test/mock_keyboard_driver_win.h',
         'test/mock_render_process.cc',
         'test/mock_render_process.h',
+        'test/mock_webclipboard_impl.cc',
+        'test/mock_webclipboard_impl.h',
+        'test/net/url_request_abort_on_end_job.cc',
+        'test/net/url_request_abort_on_end_job.h',
         'test/net/url_request_failed_job.cc',
         'test/net/url_request_failed_job.h',
         'test/net/url_request_mock_http_job.cc',
@@ -122,8 +127,6 @@
         'test/net/url_request_prepackaged_interceptor.h',
         'test/net/url_request_slow_download_job.cc',
         'test/net/url_request_slow_download_job.h',
-        'test/net/url_request_abort_on_end_job.cc',
-        'test/net/url_request_abort_on_end_job.h',
         'test/ppapi_unittest.cc',
         'test/ppapi_unittest.h',
         'test/test_content_browser_client.cc',
@@ -140,6 +143,19 @@
         'test/test_web_contents.h',
         'test/test_web_contents_view.cc',
         'test/test_web_contents_view.h',
+        'test/test_webkit_platform_support.cc',
+        'test/test_webkit_platform_support.h',
+        'test/web_gesture_curve_mock.cc',
+        'test/web_gesture_curve_mock.h',
+        'test/web_layer_tree_view_impl_for_testing.cc',
+        'test/web_layer_tree_view_impl_for_testing.h',
+        'test/webkit_support.cc',
+        'test/webkit_support.h',
+        'test/webkit_support_glue.cc',
+        'test/weburl_loader_mock.cc',
+        'test/weburl_loader_mock.h',
+        'test/weburl_loader_mock_factory.cc',
+        'test/weburl_loader_mock_factory.h',
 
         # TODO(phajdan.jr): Those files should be moved to webkit
         # test support target.
@@ -166,6 +182,25 @@
             ['include', '^test/test_content_client\\.cc$'],
           ],
         }, {  # OS != "ios"
+          'conditions': [
+            ['OS=="mac"', {
+              'copies': [{
+                'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit',
+                'files': [
+                  '../webkit/tools/test_shell/resources/missingImage.png',
+                  '../webkit/tools/test_shell/resources/textAreaResizeCorner.png',
+                ],
+              }],
+            }, { # OS!="mac"
+              'copies': [{
+                'destination': '<(PRODUCT_DIR)/DumpRenderTree_resources',
+                'files': [
+                  '../webkit/tools/test_shell/resources/missingImage.gif',
+                  '../webkit/tools/test_shell/resources/textAreaResizeCorner.png',
+                ],
+              }],
+            }],
+          ],
           'dependencies': [
             'content_child',
             'content_gpu',
@@ -182,10 +217,13 @@
             '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
             '../ui/surface/surface.gyp:surface',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
+            '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
             '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-            '../webkit/support/webkit_support.gyp:webkit_support_common',
+            '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
+            '../webkit/support/webkit_support.gyp:glue',
+            '../webkit/support/webkit_support.gyp:glue_child',
           ],
         }],
         ['OS == "win" or toolkit_uses_gtk == 1', {
@@ -1070,7 +1108,7 @@
           'target_name': 'content_webkit_unit_test_support',
           'type': 'static_library',
           'dependencies': [
-            '../webkit/support/webkit_support.gyp:webkit_support',
+            'test_support_content',
           ],
           'include_dirs': [
             '..',
diff --git a/content/shell/browser/shell_browser_main.cc b/content/shell/browser/shell_browser_main.cc
index 44871db..8e61f6a 100644
--- a/content/shell/browser/shell_browser_main.cc
+++ b/content/shell/browser/shell_browser_main.cc
@@ -21,8 +21,8 @@
 #include "content/shell/browser/webkit_test_controller.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
+#include "content/test/webkit_support.h"
 #include "net/base/net_util.h"
-#include "webkit/support/webkit_support.h"
 
 #if defined(OS_ANDROID)
 #include "base/run_loop.h"
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index 433b368..8569a09 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -15,6 +15,7 @@
 #include "content/shell/renderer/shell_render_process_observer.h"
 #include "content/shell/renderer/shell_render_view_observer.h"
 #include "content/shell/renderer/webkit_test_runner.h"
+#include "content/test/mock_webclipboard_impl.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
 #include "third_party/WebKit/public/testing/WebTestInterfaces.h"
 #include "third_party/WebKit/public/testing/WebTestProxy.h"
@@ -22,7 +23,6 @@
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
-#include "webkit/support/mock_webclipboard_impl.h"
 
 using WebKit::WebAudioDevice;
 using WebKit::WebClipboard;
diff --git a/content/test/DEPS b/content/test/DEPS
index d8eb582..1949e27 100644
--- a/content/test/DEPS
+++ b/content/test/DEPS
@@ -6,4 +6,5 @@ include_rules = [
   "+ui/aura/test/test_aura_initializer.h",
   "+ui/base/resource/data_pack.h",
   "+third_party/WebKit/public/testing",
+  "!v8/include/v8.h",
 ]
diff --git a/webkit/support/mock_webclipboard_impl.cc b/content/test/mock_webclipboard_impl.cc
index f1c6d42..8e32635 100644
--- a/webkit/support/mock_webclipboard_impl.cc
+++ b/content/test/mock_webclipboard_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/mock_webclipboard_impl.h"
+#include "content/test/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
diff --git a/webkit/support/mock_webclipboard_impl.h b/content/test/mock_webclipboard_impl.h
index 61efcf4..b3f8b9c 100644
--- a/webkit/support/mock_webclipboard_impl.h
+++ b/content/test/mock_webclipboard_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -7,8 +7,8 @@
 // clipboard, which allows for running them in parallel and having the tests
 // not interact with actual user actions.
 
-#ifndef WEBKIT_SUPPORT_MOCK_WEBCLIPBOARD_IMPL_H_
-#define WEBKIT_SUPPORT_MOCK_WEBCLIPBOARD_IMPL_H_
+#ifndef CONTENT_TEST_MOCK_WEBCLIPBOARD_IMPL_H_
+#define CONTENT_TEST_MOCK_WEBCLIPBOARD_IMPL_H_
 
 #include <map>
 
@@ -57,4 +57,4 @@ class MockWebClipboardImpl : public WebKit::WebClipboard {
   bool m_writeSmartPaste;
 };
 
-#endif  // WEBKIT_SUPPORT_MOCK_WEBCLIPBOARD_IMPL_H_
+#endif  // CONTENT_TEST_MOCK_WEBCLIPBOARD_IMPL_H_
diff --git a/webkit/support/test_webkit_platform_support.cc b/content/test/test_webkit_platform_support.cc
index ae0a7e5..9ad1e2e 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/content/test/test_webkit_platform_support.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/test_webkit_platform_support.h"
+#include "content/test/test_webkit_platform_support.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -11,6 +11,10 @@
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/test/mock_webclipboard_impl.h"
+#include "content/test/web_gesture_curve_mock.h"
+#include "content/test/web_layer_tree_view_impl_for_testing.h"
+#include "content/test/weburl_loader_mock_factory.h"
 #include "media/base/media.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
@@ -32,10 +36,6 @@
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
-#include "webkit/support/mock_webclipboard_impl.h"
-#include "webkit/support/web_gesture_curve_mock.h"
-#include "webkit/support/web_layer_tree_view_impl_for_testing.h"
-#include "webkit/support/weburl_loader_mock_factory.h"
 
 #if defined(OS_WIN)
 #include "third_party/WebKit/public/platform/win/WebThemeEngine.h"
diff --git a/webkit/support/test_webkit_platform_support.h b/content/test/test_webkit_platform_support.h
index 0a4e4cb..7c02705 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/content/test/test_webkit_platform_support.h
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
-#define WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
+#ifndef CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
+#define CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
+#include "content/test/mock_webclipboard_impl.h"
+#include "content/test/weburl_loader_mock_factory.h"
 #include "third_party/WebKit/public/platform/WebUnitTestSupport.h"
 #include "webkit/child/webkitplatformsupport_child_impl.h"
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
-#include "webkit/support/mock_webclipboard_impl.h"
-#include "webkit/support/weburl_loader_mock_factory.h"
 
 namespace WebKit {
 class WebLayerTreeView;
@@ -108,4 +108,4 @@ class TestWebKitPlatformSupport :
   DISALLOW_COPY_AND_ASSIGN(TestWebKitPlatformSupport);
 };
 
-#endif  // WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
+#endif  // CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
diff --git a/webkit/support/web_gesture_curve_mock.cc b/content/test/web_gesture_curve_mock.cc
index a3b4917..0fd96df 100644
--- a/webkit/support/web_gesture_curve_mock.cc
+++ b/content/test/web_gesture_curve_mock.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/web_gesture_curve_mock.h"
+#include "content/test/web_gesture_curve_mock.h"
 
+#include "content/test/weburl_loader_mock_factory.h"
 #include "third_party/WebKit/public/platform/WebFloatSize.h"
 #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h"
-#include "webkit/support/weburl_loader_mock_factory.h"
 
 WebGestureCurveMock::WebGestureCurveMock(const WebKit::WebFloatPoint& velocity,
     const WebKit::WebSize& cumulative_scroll)
diff --git a/webkit/support/web_gesture_curve_mock.h b/content/test/web_gesture_curve_mock.h
index f05f4e9..d58137f 100644
--- a/webkit/support/web_gesture_curve_mock.h
+++ b/content/test/web_gesture_curve_mock.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_SUPPORT_WEB_GESTURE_CURVE_MOCK_H_
-#define WEBKIT_SUPPORT_WEB_GESTURE_CURVE_MOCK_H_
+#ifndef CONTENT_TEST_WEB_GESTURE_CURVE_MOCK_H_
+#define CONTENT_TEST_WEB_GESTURE_CURVE_MOCK_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
@@ -29,4 +29,4 @@ class WebGestureCurveMock : public WebKit::WebGestureCurve {
   DISALLOW_COPY_AND_ASSIGN(WebGestureCurveMock);
 };
 
-#endif  // WEBKIT_SUPPORT_WEB_GESTURE_CURVE_MOCK_H_
+#endif  // CONTENT_TEST_WEB_GESTURE_CURVE_MOCK_H_
diff --git a/webkit/support/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc
index 93bfcbe..25f01c3 100644
--- a/webkit/support/web_layer_tree_view_impl_for_testing.cc
+++ b/content/test/web_layer_tree_view_impl_for_testing.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/web_layer_tree_view_impl_for_testing.h"
+#include "content/test/web_layer_tree_view_impl_for_testing.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ -13,6 +13,7 @@
 #include "cc/layers/layer.h"
 #include "cc/output/output_surface.h"
 #include "cc/trees/layer_tree_host.h"
+#include "content/test/test_webkit_platform_support.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebLayer.h"
@@ -21,7 +22,6 @@
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "webkit/common/gpu/test_context_provider_factory.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
-#include "webkit/support/test_webkit_platform_support.h"
 
 using WebKit::WebColor;
 using WebKit::WebGraphicsContext3D;
diff --git a/webkit/support/web_layer_tree_view_impl_for_testing.h b/content/test/web_layer_tree_view_impl_for_testing.h
index 612f0f0..3f67aac 100644
--- a/webkit/support/web_layer_tree_view_impl_for_testing.h
+++ b/content/test/web_layer_tree_view_impl_for_testing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_SUPPORT_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
-#define WEBKIT_SUPPORT_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
+#ifndef CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
+#define CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/trees/layer_tree_host_client.h"
@@ -84,4 +84,4 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
 
 }  // namespace webkit
 
-#endif  // WEBKIT_SUPPORT_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
+#endif  // CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
diff --git a/webkit/support/webkit_support.cc b/content/test/webkit_support.cc
index 6f9d41a..e687e57 100644
--- a/webkit/support/webkit_support.cc
+++ b/content/test/webkit_support.cc
@@ -1,18 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/webkit_support.h"
+#include "content/test/webkit_support.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "content/test/test_webkit_platform_support.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "url/url_util.h"
 #include "webkit/common/user_agent/user_agent.h"
 #include "webkit/common/user_agent/user_agent_util.h"
-#include "webkit/support/test_webkit_platform_support.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
diff --git a/webkit/support/webkit_support.h b/content/test/webkit_support.h
index ed09e67..a34a141 100644
--- a/webkit/support/webkit_support.h
+++ b/content/test/webkit_support.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
-#define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
+#ifndef CONTENT_TEST_WEBKIT_SUPPORT_H_
+#define CONTENT_TEST_WEBKIT_SUPPORT_H_
 
 // This package provides functions used by webkit_unit_tests.
 namespace webkit_support {
@@ -14,4 +14,4 @@ void TearDownTestEnvironment();
 
 }  // namespace webkit_support
 
-#endif  // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
+#endif  // CONTENT_TEST_WEBKIT_SUPPORT_H_
diff --git a/webkit/support/webkit_support_glue.cc b/content/test/webkit_support_glue.cc
index b49522d..5270e12 100644
--- a/webkit/support/webkit_support_glue.cc
+++ b/content/test/webkit_support_glue.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/content/test/webkit_unit_test_support.cc b/content/test/webkit_unit_test_support.cc
index bb617a8..d503e16 100644
--- a/content/test/webkit_unit_test_support.cc
+++ b/content/test/webkit_unit_test_support.cc
@@ -4,7 +4,7 @@
 
 #include "content/test/webkit_unit_test_support.h"
 
-#include "webkit/support/webkit_support.h"
+#include "content/test/webkit_support.h"
 
 namespace content {
 
diff --git a/webkit/support/weburl_loader_mock.cc b/content/test/weburl_loader_mock.cc
index 06aff4d..4eb37be53 100644
--- a/webkit/support/weburl_loader_mock.cc
+++ b/content/test/weburl_loader_mock.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/weburl_loader_mock.h"
+#include "content/test/weburl_loader_mock.h"
 
 #include "base/logging.h"
+#include "content/test/weburl_loader_mock_factory.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
-#include "webkit/support/weburl_loader_mock_factory.h"
 
 WebURLLoaderMock::WebURLLoaderMock(WebURLLoaderMockFactory* factory,
                                    WebKit::WebURLLoader* default_loader)
diff --git a/webkit/support/weburl_loader_mock.h b/content/test/weburl_loader_mock.h
index 46de7be..6a77fd9 100644
--- a/webkit/support/weburl_loader_mock.h
+++ b/content/test/weburl_loader_mock.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_H_
-#define WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_H_
+#ifndef CONTENT_TEST_WEBURL_LOADER_MOCK_H_
+#define CONTENT_TEST_WEBURL_LOADER_MOCK_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -61,4 +61,4 @@ class WebURLLoaderMock : public WebKit::WebURLLoader {
   DISALLOW_COPY_AND_ASSIGN(WebURLLoaderMock);
 };
 
-#endif  // WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_H_
+#endif  // CONTENT_TEST_WEBURL_LOADER_MOCK_H_
diff --git a/webkit/support/weburl_loader_mock_factory.cc b/content/test/weburl_loader_mock_factory.cc
index f459211..0b386e1 100644
--- a/webkit/support/weburl_loader_mock_factory.cc
+++ b/content/test/weburl_loader_mock_factory.cc
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/support/weburl_loader_mock_factory.h"
+#include "content/test/weburl_loader_mock_factory.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
+#include "content/test/webkit_support.h"
+#include "content/test/weburl_loader_mock.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebCache.h"
-#include "webkit/support/webkit_support.h"
-#include "webkit/support/weburl_loader_mock.h"
 
 using WebKit::WebCache;
 using WebKit::WebData;
diff --git a/webkit/support/weburl_loader_mock_factory.h b/content/test/weburl_loader_mock_factory.h
index 8f00fc0..50d126d 100644
--- a/webkit/support/weburl_loader_mock_factory.h
+++ b/content/test/weburl_loader_mock_factory.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_FACTORY_H_
-#define WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_FACTORY_H_
+#ifndef CONTENT_TEST_WEBURL_LOADER_MOCK_FACTORY_H_
+#define CONTENT_TEST_WEBURL_LOADER_MOCK_FACTORY_H_
 
 #include <map>
 
@@ -111,5 +111,5 @@ class WebURLLoaderMockFactory {
   DISALLOW_COPY_AND_ASSIGN(WebURLLoaderMockFactory);
 };
 
-#endif  // WEBKIT_SUPPORT_WEBURL_LOADER_MOCK_FACTORY_H_
+#endif  // CONTENT_TEST_WEBURL_LOADER_MOCK_FACTORY_H_
 
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index adbd54d..c2c3fed 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -9,6 +9,9 @@
      'cflags+': ['-Wno-narrowing'],
      'cflags_cc+': ['-Wno-narrowing'],
   },
+  'variables': {
+    'chromium_code': 1,
+  },
   'targets': [
     {
       'target_name': 'glue_child',
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 5bbf80a..f7d6d5f 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -11,7 +11,6 @@
       'includes': [
         '../../build/win_precompile.gypi',
         '../glue/webkit_glue.gypi',
-        'webkit_support.gypi',
       ],
     }],
   ],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
deleted file mode 100644
index e8227f0..0000000
--- a/webkit/support/webkit_support.gypi
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'webkit_support',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/cc/cc.gyp:cc',
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/ui/gl/gl.gyp:gl',
-        '<(DEPTH)/ui/ui.gyp:shell_dialogs',
-        '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-        '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
-        '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
-        '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-        '<(DEPTH)/webkit/renderer/webkit_renderer.gyp:webkit_renderer',
-        '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-        'glue',
-        'glue_child',
-        'webkit_support_common',
-      ],
-      'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit
-      ],
-      'defines': [
-        # Technically not a unit test but require functions available only to
-        # unit tests.
-        'UNIT_TEST'
-      ],
-      'sources': [
-        'test_webkit_platform_support.cc',
-        'test_webkit_platform_support.h',
-        'webkit_support.cc',
-        'webkit_support.h',
-        'webkit_support_glue.cc',
-        'weburl_loader_mock.cc',
-        'weburl_loader_mock.h',
-        'weburl_loader_mock_factory.cc',
-        'weburl_loader_mock_factory.h',
-        'web_gesture_curve_mock.cc',
-        'web_gesture_curve_mock.h',
-        'web_layer_tree_view_impl_for_testing.cc',
-        'web_layer_tree_view_impl_for_testing.h',
-      ],
-      'conditions': [
-        ['OS=="mac"', {
-          'copies': [{
-            'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-            'files': [
-              '../tools/test_shell/resources/missingImage.png',
-              '../tools/test_shell/resources/textAreaResizeCorner.png',
-            ],
-          }],
-        },{ # OS!="mac"
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)/DumpRenderTree_resources',
-            'files': [
-              '../tools/test_shell/resources/missingImage.gif',
-              '../tools/test_shell/resources/textAreaResizeCorner.png',
-            ],
-          }],
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-
-    {
-      'target_name': 'webkit_support_common',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
-        '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '<(DEPTH)/webkit/renderer/webkit_renderer.gyp:webkit_renderer',
-        'glue',
-      ],
-      'export_dependent_settings': [
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'sources': [
-        '<(DEPTH)/webkit/support/mock_webclipboard_impl.cc',
-        '<(DEPTH)/webkit/support/mock_webclipboard_impl.h',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-  ],
-}