Move the corresponding cc files from content\test to be alongside their headers in content\public\t…

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         '../build/temp_gyp/googleurl.gyp:googleurl',
         'content_app',
         'content_browser',
         'content_common',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui_test_support',
         '../webkit/support/webkit_support.gyp:appcache',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'public/test/accessibility_test_utils_win.cc',
         'public/test/accessibility_test_utils_win.h',
         'public/test/browser_test.h',
+        'public/test/browser_test_base.cc',
         'public/test/browser_test_base.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/js_injection_ready_observer.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/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_browsertest.cc',
         'public/test/render_widget_browsertest.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_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_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/arbitrator_dependency_factories_for_test.cc',
         'browser/geolocation/arbitrator_dependency_factories_for_test.h',
         'browser/geolocation/fake_access_token_store.cc',
         'browser/geolocation/fake_access_token_store.h',
         'browser/geolocation/mock_location_provider.cc',
         'browser/geolocation/mock_location_provider.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',
         'browser/web_contents/test_web_contents.cc',
         'browser/web_contents/test_web_contents.h',
         'common/test_url_constants.cc',
         'common/test_url_constants.h',
         'gpu/gpu_idirect3d9_mock_win.cc',
         'gpu/gpu_idirect3d9_mock_win.h',
-        'test/accessibility_test_utils_win.cc',
-        'test/browser_test_base.cc',
-        'test/browser_test_utils.cc',
         'test/content_test_suite.cc',
         'test/content_test_suite.h',
-        'test/content_test_suite_base.cc',
-        'test/download_test_observer.cc',
         'test/gpu/gpu_test_config.cc',
         'test/gpu/gpu_test_config.h',
         'test/gpu/gpu_test_expectations_parser.cc',
         'test/gpu/gpu_test_expectations_parser.h',
-        'test/mock_download_item.cc',
-        'test/mock_download_manager.cc',
         'test/mock_keyboard.cc',
         'test/mock_keyboard_driver_win.cc',
         'test/mock_keyboard_driver_win.h',
         'test/mock_keyboard.h',
-        'test/mock_notification_observer.cc',
         'test/mock_render_process.cc',
         'test/mock_render_process.h',
-        'test/mock_render_process_host.cc',
-        'test/mock_render_thread.cc',
-        'test/mock_resource_context.cc',
         '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_slow_download_job.cc',
         'test/net/url_request_slow_download_job.h',
         'test/net/url_request_slow_http_job.cc',
         'test/net/url_request_slow_http_job.h',
         'test/net/url_request_abort_on_end_job.cc',
         'test/net/url_request_abort_on_end_job.h',
-        'test/render_view_fake_resources_test.cc',
-        'test/render_view_test.cc',
-        'test/render_widget_browsertest.cc',
-        'test/test_browser_context.cc',
-        'test/test_browser_thread.cc',
         'test/test_content_browser_client.cc',
         'test/test_content_browser_client.h',
         'test/test_content_client.cc',
         'test/test_content_client.h',
-        'test/test_content_client_initializer.cc',
-        'test/test_file_error_injector.cc',
-        'test/test_navigation_observer.cc',
-        'test/test_notification_tracker.cc',
-        'test/test_renderer_host.cc',
         'test/test_render_view_host_factory.cc',
         'test/test_render_view_host_factory.h',
-        'test/test_launcher.cc',
-        'test/test_utils.cc',
         'test/test_web_contents_view.cc',
         'test/test_web_contents_view.h',
-        'test/unittest_test_suite.cc',
-        'test/web_contents_tester.cc',
 
         # TODO(phajdan.jr): Those files should be moved to webkit
         # test support target.
         '../webkit/appcache/appcache_test_helper.cc',
         '../webkit/appcache/appcache_test_helper.h',
         '../webkit/quota/mock_special_storage_policy.cc',
         '../webkit/quota/mock_special_storage_policy.h',
       ],
       'conditions': [
         ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
@@ skipping 692 matching lines @@
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
               ]
             }
           ],
         },
       ],
     }],
   ],
 }