Introduce a separate gyp file for content shell and tests

This will make it possible to depend on components from content shell

BUG=247431
R=jam@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/28123002

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

15 files changed, 118 insertions, 433 deletions

diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index bb9cc0f..e416559 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -51,7 +51,7 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
-        '../content/content.gyp:content_java_test_support',
+        '../content/content_shell_and_tests.gyp:content_java_test_support',
         '../net/net.gyp:net_java_test_support',
         'android_webview_apk_java',
       ],
@@ -67,7 +67,7 @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        '../content/content.gyp:test_support_content',
+        '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net_test_support',
         '../testing/android/native_test.gyp:native_test_native_code',
         '../testing/gmock.gyp:gmock',
@@ -94,7 +94,7 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
-        '../content/content.gyp:content_java_test_support',
+        '../content/content_shell_and_tests.gyp:content_java_test_support',
         'android_webview_java',
       ],
       'variables': {
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 2b8589a..e956c46 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -117,7 +117,7 @@
             'apps',
             '../base/base.gyp:base',
             '../content/content.gyp:content',
-            '../content/content.gyp:content_shell_lib',
+            '../content/content_shell_and_tests.gyp:content_shell_lib',
             '../skia/skia.gyp:skia',
             '../ui/shell/shell.gyp:shell',
             '../ui/views/views.gyp:views',
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 10ac481..b83f886 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -681,7 +681,7 @@
         '../base/base.gyp:test_support_base',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_browser',
-        '../content/content.gyp:test_support_content',
+        '../content/content_shell_and_tests.gyp:test_support_content',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
@@ -880,7 +880,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../chrome/chrome_resources.gyp:packed_resources',
-        '../content/content.gyp:content_shell_lib',
+        '../content/content_shell_and_tests.gyp:content_shell_lib',
         '../content/content.gyp:content',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
diff --git a/build/all.gyp b/build/all.gyp
index e2cced9..b7e0c83 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -232,9 +232,9 @@
             '../chrome/chrome.gyp:sync_integration_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_shell',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_shell',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../device/device_tests.gyp:device_unittests',
             '../google_apis/google_apis.gyp:google_apis_unittests',
             '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
@@ -355,7 +355,7 @@
           'type': 'none',
           'dependencies': [
             '../third_party/WebKit/public/all.gyp:all_blink',
-            '../content/content.gyp:content_shell',
+            '../content/content_shell_and_tests.gyp:content_shell',
           ],
         }, # target_name: all_webkit
         {
@@ -397,8 +397,8 @@
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:performance_browser_tests',
             '../chrome/chrome.gyp:performance_ui_tests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_gl_tests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_gl_tests',
             '../gpu/gpu.gyp:gl_tests',
           ],
           'conditions': [
@@ -424,8 +424,8 @@
           'type': 'none',
           'dependencies': [
             '../chrome/chrome.gyp:chrome',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_gl_tests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_gl_tests',
             '../gpu/gpu.gyp:gl_tests',
           ],
           'conditions': [
@@ -501,8 +501,8 @@
           'dependencies': [
             'chromium_builder_qa',  # needed for perf pyauto tests
             '../chrome/chrome.gyp:browser_tests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../third_party/libjingle/libjingle.gyp:peerconnection_server',
             '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
             '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
@@ -532,19 +532,19 @@
 
             # We refer to content_shell directly rather than all_webkit
             # because we don't want the _unittests binaries.
-            '../content/content.gyp:content_shell',
+            '../content/content_shell_and_tests.gyp:content_shell',
           ],
           'conditions': [
             ['OS!="win"', {
               'dependencies': [
-                '../content/content.gyp:content_browsertests',
+                '../content/content_shell_and_tests.gyp:content_browsertests',
                 '../net/net.gyp:dns_fuzz_stub',
               ],
             }],
             ['OS=="win" and fastbuild==0 and target_arch=="ia32"', {
               'dependencies': [
                 '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy',
-                '../content/content.gyp:content_shell_syzyasan',
+                '../content/content_shell_and_tests.gyp:content_shell_syzyasan',
               ],
               'conditions': [
                 ['chrome_multiple_dll==1', {
@@ -583,8 +583,8 @@
             '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../device/device_tests.gyp:device_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
@@ -616,8 +616,8 @@
             '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../device/device_tests.gyp:device_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
@@ -670,7 +670,7 @@
             '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../crypto/crypto.gyp:crypto_unittests',
             '../device/device_tests.gyp:device_unittests',
             '../ipc/ipc.gyp:ipc_tests',
@@ -709,8 +709,8 @@
             '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',
@@ -777,7 +777,7 @@
             '../base/base.gyp:base_unittests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../crypto/crypto.gyp:crypto_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
@@ -800,7 +800,7 @@
             '../chrome/chrome.gyp:browser_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../crypto/crypto.gyp:crypto_unittests',
             '../device/device_tests.gyp:device_unittests',
             '../ipc/ipc.gyp:ipc_tests',
@@ -890,8 +890,8 @@
             '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../components/components.gyp:components_unittests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../device/device_tests.gyp:device_unittests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 0e67fb4..708646c 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -17,7 +17,7 @@
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
-        '../content/content.gyp:content_shell_apk',
+        '../content/content_shell_and_tests.gyp:content_shell_apk',
         '<@(android_app_targets)',
         'android_builder_tests',
         '../android_webview/android_webview.gyp:android_webview_apk',
@@ -34,7 +34,7 @@
       'type': 'none',
       'dependencies': [
         '../third_party/WebKit/public/all.gyp:all_blink',
-        '../content/content.gyp:content_shell_apk',
+        '../content/content_shell_and_tests.gyp:content_shell_apk',
       ],
     }, # target_name: all_webkit
     {
@@ -64,10 +64,10 @@
         '../cc/cc_tests.gyp:cc_unittests',
         '../chrome/chrome.gyp:unit_tests',
         '../components/components.gyp:components_unittests',
-        '../content/content.gyp:content_browsertests',
-        '../content/content.gyp:content_gl_tests',
-        '../content/content.gyp:content_shell_test_apk',
-        '../content/content.gyp:content_unittests',
+        '../content/content_shell_and_tests.gyp:content_browsertests',
+        '../content/content_shell_and_tests.gyp:content_gl_tests',
+        '../content/content_shell_and_tests.gyp:content_shell_test_apk',
+        '../content/content_shell_and_tests.gyp:content_unittests',
         '../gpu/gpu.gyp:gl_tests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
@@ -96,10 +96,10 @@
             '../cc/cc_tests.gyp:cc_unittests_apk',
             '../chrome/chrome.gyp:unit_tests_apk',
             '../components/components.gyp:components_unittests_apk',
-            '../content/content.gyp:content_browsertests_apk',
-            '../content/content.gyp:content_gl_tests_apk',
-            '../content/content.gyp:content_unittests_apk',
-            '../content/content.gyp:video_decode_accelerator_unittest_apk',
+            '../content/content_shell_and_tests.gyp:content_browsertests_apk',
+            '../content/content_shell_and_tests.gyp:content_gl_tests_apk',
+            '../content/content_shell_and_tests.gyp:content_unittests_apk',
+            '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
             '../gpu/gpu.gyp:gl_tests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index da2ac9a..546f220 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -823,9 +823,9 @@
             '../base/base.gyp:base_unittests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
-            '../content/content.gyp:content_browsertests',
-            '../content/content.gyp:content_shell',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_browsertests',
+            '../content/content_shell_and_tests.gyp:content_shell',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             '../net/net.gyp:net_unittests',
             '../ui/ui.gyp:ui_unittests',
           ],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f44c412..3ea85f2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1882,7 +1882,7 @@
           # npapi test plugin doesn't build on android or ios
           'dependencies': [
             # build time dependency.
-            '../content/content.gyp:copy_npapi_test_plugin',
+            '../content/content_shell_and_tests.gyp:copy_npapi_test_plugin',
             '../v8/tools/gyp/v8.gyp:v8_shell#host',
           ],
         }],
@@ -2577,7 +2577,7 @@
             'common',
             'renderer',
             '../content/content.gyp:content_gpu',
-            '../content/content.gyp:test_support_content',
+            '../content/content_shell_and_tests.gyp:test_support_content',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
@@ -2893,7 +2893,7 @@
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../content/content.gyp:content_unittests',
+            '../content/content_shell_and_tests.gyp:content_unittests',
             'unit_tests',
             '../sync/sync.gyp:sync_unit_tests',
           ],  # 'dependencies'
@@ -2916,7 +2916,7 @@
                 'interactive_ui_tests',
                 # Disabled from running in coverage_posix.py.
                 # We need to build this during compile step, so enabling here.
-                '../content/content.gyp:content_browsertests',
+                '../content/content_shell_and_tests.gyp:content_browsertests',
                 '../courgette/courgette.gyp:courgette_unittests',
                 '../crypto/crypto.gyp:crypto_unittests',
                 '../jingle/jingle.gyp:jingle_unittests',
@@ -3025,7 +3025,7 @@
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
-            '../content/content.gyp:content_java_test_support',
+            '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
           ],
           'variables': {
@@ -3066,7 +3066,7 @@
           },
           'dependencies': [
             'chrome_java',
-            '../content/content.gyp:content_java_test_support',
+            '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_java',
             '../sync/sync.gyp:sync_java_test_support',
           ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index aa6235d..0ce5d8c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -20,7 +20,7 @@
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:sessions_test_support',
         '../content/content.gyp:content_app_both',
-        '../content/content.gyp:test_support_content',
+        '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 69b7e44..4d6dea7 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -414,7 +414,7 @@
         '../chrome/chrome_resources.gyp:chrome_resources',
         '../content/content.gyp:content_app_both',
         '../content/content.gyp:content_gpu',
-        '../content/content.gyp:test_support_content',
+        '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
diff --git a/components/components_tests.gypi b/components/components_tests.gypi
index 8a56830..12a79dc 100644
--- a/components/components_tests.gypi
+++ b/components/components_tests.gypi
@@ -68,7 +68,7 @@
             'json_schema',
 
             # Dependencies of intercept_navigation_resource_throttle_unittest.cc
-            '../content/content.gyp:test_support_content',
+            '../content/content_shell_and_tests.gyp:test_support_content',
             '../skia/skia.gyp:skia',
             'navigation_interception',
 
@@ -162,7 +162,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_perf',
-            '../content/content.gyp:test_support_content',
+            '../content/content_shell_and_tests.gyp:test_support_content',
             '../testing/gtest.gyp:gtest',
             '../ui/compositor/compositor.gyp:compositor',
             'visitedlink_browser',
diff --git a/content/content.gyp b/content/content.gyp
index 221a1a5..c7f3575 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -21,14 +21,10 @@
       }],
     ],
   },
-  'includes': [
-    'content_tests.gypi',
-  ],
   'conditions': [
     ['OS != "ios"', {
       'includes': [
         '../build/win_precompile.gypi',
-        'content_shell.gypi',
       ],
     }],
     # In component mode, we build all of content as a single DLL.
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index efd102f..6c0f624 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -21,22 +21,21 @@
     {
       'target_name': 'content_shell_lib',
       'type': 'static_library',
-      'defines!': ['CONTENT_IMPLEMENTATION'],
       'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'],
       'variables': {
         'chromium_code': 1,
       },
       'dependencies': [
-        'content_app_both',
-        'content_browser',
-        'content_common',
-        'content_gpu',
-        'content_plugin',
-        'content_ppapi_plugin',
-        'content_renderer',
+        'content.gyp:content_app_both',
+        'content.gyp:content_browser',
+        'content.gyp:content_common',
+        'content.gyp:content_gpu',
+        'content.gyp:content_plugin',
+        'content.gyp:content_ppapi_plugin',
+        'content.gyp:content_renderer',
+        'content.gyp:content_utility',
+        'content.gyp:content_worker',
         'content_shell_resources',
-        'content_utility',
-        'content_worker',
         'test_support_content',
         'content_resources.gyp:content_resources',
         '../base/base.gyp:base',
@@ -355,7 +354,6 @@
       'target_name': 'content_shell',
       'type': 'executable',
       'mac_bundle': 1,
-      'defines!': ['CONTENT_IMPLEMENTATION'],
       'variables': {
         'chromium_code': 1,
       },
@@ -694,7 +692,7 @@
           'target_name': 'content_shell_java',
           'type': 'none',
           'dependencies': [
-            'content_java',
+            'content.gyp:content_java',
           ],
           'variables': {
             'java_in_dir': '../content/shell/android/java',
@@ -721,7 +719,7 @@
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
-            'content_java',
+            'content.gyp:content_java',
             'content_java_test_support',
             'content_shell_java',
             'libcontent_shell_content_view',
diff --git a/content/content_shell_and_tests.gyp b/content/content_shell_and_tests.gyp
index c2b3935..b3c3c4c 100644
--- a/content/content_shell_and_tests.gyp
+++ b/content/content_shell_and_tests.gyp
@@ -18,333 +18,14 @@
       }],
     ],
   },
-  'targets': [
-    {
-      'target_name': 'test_support_content_tmp',
-      'type': 'static_library',
-      'dependencies': [
-        '../net/net.gyp:net_test_support',
-        '../skia/skia.gyp:skia',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../ui/events/events.gyp:events',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/ui.gyp:keycode_converter',
-        '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
-        '../ui/ui.gyp:ui_test_support',
-        '../url/url.gyp:url_lib',
-        'content.gyp:content_app_both',
-        'content.gyp:content_browser',
-        'content.gyp:content_common',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'public/test/browser_test_base.cc',
-        'public/test/browser_test_base.h',
-        'public/test/browser_test.h',
-        'public/test/browser_test_utils.cc',
-        'public/test/browser_test_utils.h',
-        'public/test/content_test_suite_base.cc',
-        'public/test/content_test_suite_base.h',
-        'public/test/download_test_observer.cc',
-        'public/test/download_test_observer.h',
-        'public/test/fake_speech_recognition_manager.cc',
-        'public/test/fake_speech_recognition_manager.h',
-        'public/test/js_injection_ready_observer.h',
-        'public/test/layouttest_support.h',
-        'public/test/mock_download_item.cc',
-        'public/test/mock_download_item.h',
-        'public/test/mock_download_manager.cc',
-        'public/test/mock_download_manager.h',
-        'public/test/mock_notification_observer.cc',
-        'public/test/mock_notification_observer.h',
-        'public/test/mock_render_process_host.cc',
-        'public/test/mock_render_process_host.h',
-        'public/test/mock_render_thread.cc',
-        'public/test/mock_render_thread.h',
-        'public/test/mock_resource_context.cc',
-        'public/test/mock_resource_context.h',
-        'public/test/nested_message_pump_android.cc',
-        'public/test/nested_message_pump_android.h',
-        'public/test/render_view_fake_resources_test.cc',
-        'public/test/render_view_fake_resources_test.h',
-        'public/test/render_view_test.cc',
-        'public/test/render_view_test.h',
-        'public/test/render_widget_test.cc',
-        'public/test/render_widget_test.h',
-        'public/test/sandbox_file_system_test_helper.cc',
-        'public/test/sandbox_file_system_test_helper.h',
-        'public/test/test_browser_context.cc',
-        'public/test/test_browser_context.h',
-        'public/test/test_browser_thread.cc',
-        'public/test/test_browser_thread.h',
-        'public/test/test_browser_thread_bundle.cc',
-        'public/test/test_browser_thread_bundle.h',
-        'public/test/test_content_client_initializer.cc',
-        'public/test/test_content_client_initializer.h',
-        'public/test/test_file_error_injector.cc',
-        'public/test/test_file_error_injector.h',
-        'public/test/test_file_system_backend.cc',
-        'public/test/test_file_system_backend.h',
-        'public/test/test_file_system_context.cc',
-        'public/test/test_file_system_context.h',
-        'public/test/test_file_system_options.cc',
-        'public/test/test_file_system_options.h',
-        'public/test/test_launcher.cc',
-        'public/test/test_launcher.h',
-        'public/test/test_navigation_observer.cc',
-        'public/test/test_navigation_observer.h',
-        'public/test/test_notification_tracker.cc',
-        'public/test/test_notification_tracker.h',
-        'public/test/test_renderer_host.cc',
-        'public/test/test_renderer_host.h',
-        'public/test/test_utils.cc',
-        'public/test/test_utils.h',
-        'public/test/unittest_test_suite.cc',
-        'public/test/unittest_test_suite.h',
-        'public/test/web_contents_tester.cc',
-        'public/test/web_contents_tester.h',
-        'app/startup_helper_win.cc',
-        # TODO(phajdan.jr): All of those files should live in content/test (if
-        # they're only used by content) or content/public/test (if they're used
-        # by other embedders).
-        'browser/download/mock_download_file.cc',
-        'browser/download/mock_download_file.h',
-        'browser/geolocation/fake_access_token_store.cc',
-        'browser/geolocation/fake_access_token_store.h',
-        'browser/geolocation/mock_location_arbitrator.cc',
-        'browser/geolocation/mock_location_arbitrator.h',
-        'browser/geolocation/mock_location_provider.cc',
-        'browser/geolocation/mock_location_provider.h',
-        'browser/renderer_host/compositing_iosurface_shader_programs_mac.cc',
-        'browser/renderer_host/compositing_iosurface_shader_programs_mac.h',
-        'browser/renderer_host/compositing_iosurface_transformer_mac.cc',
-        'browser/renderer_host/compositing_iosurface_transformer_mac.h',
-        'browser/renderer_host/media/mock_media_observer.cc',
-        'browser/renderer_host/media/mock_media_observer.h',
-        'browser/renderer_host/test_backing_store.cc',
-        'browser/renderer_host/test_backing_store.h',
-        'browser/renderer_host/test_render_view_host.cc',
-        'browser/renderer_host/test_render_view_host.h',
-        'gpu/gpu_idirect3d9_mock_win.cc',
-        'gpu/gpu_idirect3d9_mock_win.h',
-        'test/content_test_suite.cc',
-        'test/content_test_suite.h',
-        'test/layouttest_support.cc',
-        'test/mock_keyboard.cc',
-        'test/mock_keyboard.h',
-        'test/mock_keyboard_driver_win.cc',
-        '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/mock_webframeclient.h',
-        'test/mock_weburlloader.cc',
-        'test/mock_weburlloader.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',
-        'test/net/url_request_mock_http_job.h',
-        'test/net/url_request_prepackaged_interceptor.cc',
-        'test/net/url_request_prepackaged_interceptor.h',
-        'test/net/url_request_slow_download_job.cc',
-        'test/net/url_request_slow_download_job.h',
-        'test/ppapi_unittest.cc',
-        'test/ppapi_unittest.h',
-        'test/test_content_browser_client.cc',
-        'test/test_content_browser_client.h',
-        'test/test_content_client.cc',
-        'test/test_content_client.h',
-        'test/test_media_stream_client.cc',
-        'test/test_media_stream_client.h',
-        'test/test_render_view_host_factory.cc',
-        'test/test_render_view_host_factory.h',
-        'test/test_video_frame_provider.cc',
-        'test/test_video_frame_provider.h',
-        'test/test_web_contents.cc',
-        '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.
-        '../webkit/browser/appcache/appcache_test_helper.cc',
-        '../webkit/browser/appcache/appcache_test_helper.h',
-      ],
-      'conditions': [
-        ['OS == "ios"', {
-          'sources/': [
-            # iOS only needs a small portion of content; exclude all the
-            # implementation, and re-include what is used.
-            ['exclude', '\\.(cc|mm)$'],
-            ['include', '_ios\\.(cc|mm)$'],
-            ['include', '^public/test/content_test_suite_base\\.cc$'],
-            ['include', '^public/test/mock_notification_observer\\.cc$'],
-            ['include', '^public/test/mock_resource_context\\.cc$'],
-            ['include', '^public/test/test_browser_thread\\.cc$'],
-            ['include', '^public/test/test_content_client_initializer\\.cc$'],
-            ['include', '^public/test/test_notification_tracker\\.cc$'],
-            ['include', '^public/test/test_utils\\.cc$'],
-            ['include', '^public/test/unittest_test_suite\\.cc$'],
-            ['include', '^test/content_test_suite\\.cc$'],
-            ['include', '^test/test_content_browser_client\\.cc$'],
-            ['include', '^test/test_content_client\\.cc$'],
-          ],
-        }, {  # OS != "ios"
-          'conditions': [
-            ['OS=="mac"', {
-              'copies': [{
-                'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-                'files': [
-                  'shell/resources/missingImage.png',
-                  'shell/resources/textAreaResizeCorner.png',
-                ],
-              }],
-            }],
-          ],
-          'dependencies': [
-            'content.gyp:content_child',
-            'content.gyp:content_gpu',
-            'content.gyp:content_ppapi_plugin',
-            'content.gyp:content_renderer',
-            'content.gyp:content_utility',
-            'content.gyp:content_worker',
-            '../media/media.gyp:media',
-            '../ppapi/ppapi_internal.gyp:ppapi_host',
-            '../ppapi/ppapi_internal.gyp:ppapi_proxy',
-            '../ppapi/ppapi_internal.gyp:ppapi_shared',
-            '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
-            '../third_party/WebKit/public/blink.gyp:blink',
-            '../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/glue/webkit_glue.gyp:glue',
-            '../webkit/glue/webkit_glue.gyp:glue_child',
-            '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-            '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
-            '../webkit/storage_browser.gyp:webkit_storage_browser',
-            '../webkit/storage_common.gyp:webkit_storage_common',
-          ],
-        }],
-        ['OS == "win" or toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../sandbox/sandbox.gyp:sandbox',
-          ],
-        }],
-        ['enable_webrtc==1', {
-          'sources': [
-            'renderer/media/mock_media_stream_dependency_factory.cc',
-            'renderer/media/mock_media_stream_dependency_factory.h',
-            'renderer/media/mock_media_stream_dispatcher.cc',
-            'renderer/media/mock_media_stream_dispatcher.h',
-            'renderer/media/mock_media_stream_registry.cc',
-            'renderer/media/mock_media_stream_registry.h',
-            'renderer/media/mock_peer_connection_impl.cc',
-            'renderer/media/mock_peer_connection_impl.h',
-            'renderer/media/mock_web_rtc_peer_connection_handler_client.cc',
-            'renderer/media/mock_web_rtc_peer_connection_handler_client.h',
-            'test/webrtc_audio_device_test.cc',
-            'test/webrtc_audio_device_test.h',
-          ],
-          'dependencies': [
-            '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
-            '../third_party/libjingle/libjingle.gyp:libpeerconnection',
-            '../third_party/webrtc/modules/modules.gyp:audio_device',
-            '../third_party/webrtc/modules/modules.gyp:video_capture_module',
-          ],
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-        ['use_glib == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:glib',
-          ],
-        }],
-        ['use_aura==1', {
-          'dependencies': [
-            '../ui/aura/aura.gyp:aura_test_support',
-            '../ui/compositor/compositor.gyp:compositor',
-          ],
-        }],
-        ['OS=="win"', {
-          'dependencies': [
-            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
-          ],
-        }],
-        ['OS!="android" and OS!="ios"', {
-          'dependencies': [
-            '../third_party/libvpx/libvpx.gyp:libvpx',
-          ],
-        }],
-        ['OS=="android"', {
-          'dependencies': [
-            '../ui/ui.gyp:shell_dialogs',
-            'test_support_content_jni_headers_tmp',
-          ],
-        }],
-      ],
-    },
+  'includes': [
+    'content_tests.gypi',
   ],
   'conditions': [
-    ['OS!="ios"', {
-      'targets': [
-        {
-          'target_name': 'content_webkit_unit_test_support_tmp',
-          'type': 'static_library',
-          'dependencies': [
-            'test_support_content_tmp',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'test/webkit_unit_test_support.cc',
-            'test/webkit_unit_test_support.h',
-          ],
-        },
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'test_support_content_jni_headers_tmp',
-          'type': 'none',
-          'sources': [
-            'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/content/public/test',
-            ],
-          },
-          'variables': {
-            'jni_gen_package': 'content/public/test',
-          },
-          'includes': [ '../build/jni_generator.gypi' ],
-        },
+    ['OS != "ios"', {
+      'includes': [
+        '../build/win_precompile.gypi',
+        'content_shell.gypi',
       ],
     }],
   ],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 5fa2d3a..8606c26 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -7,7 +7,6 @@
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
-      'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
@@ -21,9 +20,9 @@
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
-        'content_app_both',
-        'content_browser',
-        'content_common',
+        'content.gyp:content_app_both',
+        'content.gyp:content_browser',
+        'content.gyp:content_common',
       ],
       'include_dirs': [
         '..',
@@ -211,12 +210,12 @@
             }],
           ],
           'dependencies': [
-            'content_child',
-            'content_gpu',
-            'content_ppapi_plugin',
-            'content_renderer',
-            'content_utility',
-            'content_worker',
+            'content.gyp:content_child',
+            'content.gyp:content_gpu',
+            'content.gyp:content_ppapi_plugin',
+            'content.gyp:content_renderer',
+            'content.gyp:content_utility',
+            'content.gyp:content_worker',
             '../media/media.gyp:media',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ -299,10 +298,9 @@
     {
       'target_name': 'content_unittests',
       'type': '<(gtest_target_type)',
-      'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
-        'content_browser',
-        'content_common',
+        'content.gyp:content_browser',
+        'content.gyp:content_common',
         'test_support_content',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         '../base/base.gyp:test_support_base',
@@ -619,11 +617,11 @@
           ],
         }, {  # OS != "ios"
           'dependencies': [
-            'content_browser',
-            'content_child',
-            'content_gpu',
-            'content_plugin',
-            'content_renderer',
+            'content.gyp:content_browser',
+            'content.gyp:content_child',
+            'content.gyp:content_gpu',
+            'content.gyp:content_plugin',
+            'content.gyp:content_renderer',
             'content_resources.gyp:content_resources',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gpu/gpu.gyp:gpu',
@@ -800,12 +798,11 @@
         {
           'target_name': 'content_browsertests',
           'type': '<(gtest_target_type)',
-          'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_common',
-            'content_gpu',
-            'content_plugin',
-            'content_renderer',
+            'content.gyp:content_common',
+            'content.gyp:content_gpu',
+            'content.gyp:content_plugin',
+            'content.gyp:content_renderer',
             'content_resources.gyp:content_resources',
             'content_shell_lib',
             'content_shell_pak',
@@ -1061,9 +1058,8 @@
         {
           'target_name': 'content_gl_tests',
           'type': '<(gtest_target_type)',
-          'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_common',
+            'content.gyp:content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../gpu/gpu.gyp:command_buffer_common',
@@ -1095,9 +1091,8 @@
         {
           'target_name': 'content_gl_benchmark',
           'type': '<(gtest_target_type)',
-          'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_common',
+            'content.gyp:content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
@@ -1118,6 +1113,21 @@
           ],
         },
         {
+          # TODO(jochen): remove this once the blink side has landed.
+          'target_name': 'content_webkit_unit_test_support_tmp',
+          'type': 'static_library',
+          'dependencies': [
+            'test_support_content',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'test/webkit_unit_test_support.cc',
+            'test/webkit_unit_test_support.h',
+          ],
+        },
+        {
           'target_name': 'content_webkit_unit_test_support',
           'type': 'static_library',
           'dependencies': [
@@ -1139,7 +1149,7 @@
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
-              'content',
+              'content.gyp:content',
               '../base/base.gyp:base',
               '../testing/gtest.gyp:gtest',
               '../media/media.gyp:media',
@@ -1205,7 +1215,7 @@
           'target_name': 'video_encode_accelerator_unittest',
           'type': 'executable',
           'dependencies': [
-            'content',
+            'content.gyp:content',
             '../base/base.gyp:base',
             '../testing/gtest.gyp:gtest',
             '../media/media.gyp:media',
@@ -1226,7 +1236,7 @@
           'target_name': 'h264_parser_unittest',
           'type': 'executable',
           'dependencies': [
-            'content_common',
+            'content.gyp:content_common',
             '../base/base.gyp:base',
             '../testing/gtest.gyp:gtest',
           ],
@@ -1268,7 +1278,7 @@
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
-            'content_java',
+            'content.gyp:content_java',
             'content_unittests',
           ],
           'variables': {
@@ -1281,8 +1291,8 @@
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
+            'content.gyp:content_java',
             'content_browsertests',
-            'content_java',
             'content_java_test_support',
             'content_shell_java',
           ],
@@ -1334,8 +1344,8 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
-            'content_common',
-            'content_java',
+            'content.gyp:content_common',
+            'content.gyp:content_java',
           ],
           'variables': {
             'java_in_dir': '../content/public/test/android/javatests',
@@ -1346,9 +1356,9 @@
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
-            'content_java',
             'content_java_test_support',
             'content_shell_apk_java',
+            'content.gyp:content_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_javatests',
             '../base/base.gyp:base_java_test_support',
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index daf1130..315f7f4 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -661,7 +661,7 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../content/content.gyp:content',
-        '../../content/content.gyp:test_support_content',
+        '../../content/content_shell_and_tests.gyp:test_support_content',
         '../../ipc/ipc.gyp:test_support_ipc',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
@@ -1034,8 +1034,8 @@
         '../../base/base.gyp:base_i18n',
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../content/content.gyp:content',
-        '../../content/content.gyp:content_shell_lib',
-        '../../content/content.gyp:test_support_content',
+        '../../content/content_shell_and_tests.gyp:content_shell_lib',
+        '../../content/content_shell_and_tests.gyp:test_support_content',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',