Revert of Split content_shell dependencies for layout tests.

content/content_tests.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
-      'target_name': 'layouttest_support_content',
-      'type': 'static_library',
-      'conditions': [
-        ['OS=="android"', {
-          'dependencies': [
-            'test_support_content_jni_headers',
-          ],
-        }],
-        ['OS!="ios"', {
-          # layouttest_support_content is not supported nor required on iOS.
-          'dependencies': [
-            '../skia/skia.gyp:skia',
-            '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/common/webkit_common.gyp:webkit_common',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'public/test/layouttest_support.h',
-            'public/test/nested_message_pump_android.cc',
-            'public/test/nested_message_pump_android.h',
-            'test/layouttest_support.cc',
-            'test/mock_webclipboard_impl.cc',
-            'test/mock_webclipboard_impl.h',
-            'test/test_media_stream_client.cc',
-            'test/test_media_stream_client.h',
-            'test/test_video_frame_provider.cc',
-            'test/test_video_frame_provider.h',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/events/events.gyp:dom4_keycode_converter',
@@ skipping 33 matching lines @@
         '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_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',
@@ skipping 48 matching lines @@
         'test/content_test_suite.cc',
         'test/content_test_suite.h',
         'test/mock_google_streaming_server.cc',
         'test/mock_google_streaming_server.h',
         '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_backing_store.cc',
         'test/test_backing_store.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_context_provider_factory.cc',
         'test/test_context_provider_factory.h',
+        'test/test_media_stream_client.cc',
+        'test/test_media_stream_client.h',
         'test/test_render_frame_host.cc',
         'test/test_render_frame_host.h',
         'test/test_render_frame_host_factory.cc',
         'test/test_render_frame_host_factory.h',
         'test/test_render_view_host.cc',
         'test/test_render_view_host.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/weburl_loader_mock.cc',
         'test/weburl_loader_mock.h',
         'test/weburl_loader_mock_factory.cc',
         'test/weburl_loader_mock_factory.h',
       ],
       'conditions': [
         ['OS == "ios"', {
           'sources/': [
             # iOS only needs a small portion of content; exclude all the
             # implementation, and re-include what is used.
@@ skipping 100 matching lines @@
           ],
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
+            'test_support_content_jni_headers',
           ],
         }],
       ],
     },
     {
       'target_name': 'content_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
-        'browser/speech/proto/speech_proto.gyp:speech_proto',
         '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',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/re2/re2.gyp:re2',
         '../ui/accessibility/accessibility.gyp:accessibility',
@@ skipping 628 matching lines @@
           'type': '<(gtest_target_type)',
           'dependencies': [
             'content.gyp:content_common',
             'content.gyp:content_gpu',
             'content.gyp:content_plugin',
             'content.gyp:content_renderer',
             'content_browser_test_support',
             'content_resources.gyp:content_resources',
             'content_shell_lib',
             'content_shell_pak',
-            'test_support_content',
             '../base/base.gyp:test_support_base',
             '../gin/gin.gyp:gin',
             '../gpu/gpu.gyp:gpu',
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ skipping 336 matching lines @@
         {
           'target_name': 'content_webkit_unit_test_support',
           'type': 'static_library',
           'dependencies': [
             'test_support_content',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
-            'test/mock_webclipboard_impl.cc',
-            'test/mock_webclipboard_impl.h',
-            'test/test_webkit_platform_support.cc',
-            'test/test_webkit_platform_support.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_unit_test_support.cc',
             'test/webkit_unit_test_support.h',
           ],
         },
       ],
     }],
     ['chromeos==1 or OS=="win" or OS=="android"', {
       'targets': [
           {
             'target_name': 'video_decode_accelerator_unittest',
@@ skipping 448 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }