Move files out of chrome\browser\renderer_host\test alongside their source. ...

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 65 matching lines @@
         'browser/net/url_request_mock_net_error_job.cc',
         'browser/net/url_request_mock_net_error_job.h',
         'browser/notifications/notification_test_util.cc',
         'browser/notifications/notification_test_util.h',
         'browser/prefs/pref_observer_mock.cc',
         'browser/prefs/pref_observer_mock.h',
         'browser/prefs/pref_service_mock_builder.cc',
         'browser/prefs/pref_service_mock_builder.h',
         'browser/prefs/testing_pref_store.cc',
         'browser/prefs/testing_pref_store.h',
-        'browser/renderer_host/test/test_backing_store.cc',
-        'browser/renderer_host/test/test_backing_store.h',
-        'browser/renderer_host/test/test_render_view_host.cc',
-        'browser/renderer_host/test/test_render_view_host.h',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
         'browser/sync/profile_sync_service_mock.cc',
         'browser/sync/profile_sync_service_mock.h',
         'browser/sync/syncable/syncable_mock.cc',
         'browser/sync/syncable/syncable_mock.h',
         'browser/ui/browser.h',
         'browser/ui/cocoa/browser_test_helper.cc',
         'browser/ui/cocoa/browser_test_helper.h',
         'browser/ui/tab_contents/test_tab_contents_wrapper.cc',
@@ skipping 72 matching lines @@
         'test/ui_test_utils.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
         'test/unit/chrome_test_suite.cc',
         'test/unit/chrome_test_suite.h',
         'test/values_test_util.cc',
         'test/values_test_util.h',
         '../content/browser/renderer_host/mock_render_process_host.cc',
         '../content/browser/renderer_host/mock_render_process_host.h',
+        '../content/browser/renderer_host/test_backing_store.cc',
+        '../content/browser/renderer_host/test_backing_store.h',
+        '../content/browser/renderer_host/test_render_view_host.cc',
+        '../content/browser/renderer_host/test_render_view_host.h',
         '../content/browser/tab_contents/test_tab_contents.cc',
         '../content/browser/tab_contents/test_tab_contents.h',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
           ],
         }],
@@ skipping 1250 matching lines @@
         'browser/printing/print_dialog_cloud_unittest.cc',
         'browser/printing/print_job_unittest.cc',
         'browser/printing/print_preview_tab_controller_unittest.cc',
         'browser/process_info_snapshot_mac_unittest.cc',
         'browser/process_singleton_mac_unittest.cc',
         'browser/profiles/profile_manager_unittest.cc',
         'browser/remoting/directory_add_request_unittest.cc',
         'browser/renderer_host/gtk_im_context_wrapper_unittest.cc',
         'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
         'browser/renderer_host/render_widget_host_view_mac_unittest.mm',
-        'browser/renderer_host/test/render_view_host_unittest.cc',
-        'browser/renderer_host/test/site_instance_unittest.cc',
         'browser/renderer_host/web_cache_manager_unittest.cc',
         'browser/resources_util_unittest.cc',
         'browser/rlz/rlz_unittest.cc',
         'browser/safe_browsing/bloom_filter_unittest.cc',
         'browser/safe_browsing/chunk_range_unittest.cc',
         'browser/safe_browsing/client_side_detection_host_unittest.cc',
         'browser/safe_browsing/client_side_detection_service_unittest.cc',
         'browser/safe_browsing/malware_details_unittest.cc',
         'browser/safe_browsing/prefix_set_unittest.cc',
         'browser/safe_browsing/protocol_manager_unittest.cc',
@@ skipping 381 matching lines @@
         'test/test_notification_tracker.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
         'tools/convert_dict/convert_dict_unittest.cc',
         '../content/browser/browser_thread_unittest.cc',
         '../content/browser/child_process_security_policy_unittest.cc',
         '../content/browser/gpu_blacklist_unittest.cc',
         '../content/browser/host_zoom_map_unittest.cc',
         '../content/browser/plugin_service_unittest.cc',
         '../content/browser/renderer_host/audio_renderer_host_unittest.cc',
+        '../content/browser/renderer_host/render_view_host_unittest.cc',
         '../content/browser/renderer_host/render_widget_host_unittest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_unittest.cc',
         '../content/browser/renderer_host/resource_queue_unittest.cc',
+        '../content/browser/site_instance_unittest.cc',
         '../content/browser/tab_contents/navigation_controller_unittest.cc',
         '../content/browser/tab_contents/navigation_entry_unittest.cc',
         '../content/browser/tab_contents/render_view_host_manager_unittest.cc',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc',
         '../webkit/fileapi/file_system_url_request_job_unittest.cc',
       ],
       'conditions': [
         ['touchui==1', {
@@ skipping 253 matching lines @@
       'include_dirs': [
         '..',
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_dll_version.rc.version',
+        'browser/accessibility/renderer_accessibility_browsertest.cc',
         'browser/autocomplete/autocomplete_browsertest.cc',
         'browser/autofill/form_structure_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browsing_data_database_helper_browsertest.cc',
         'browser/browsing_data_helper_browsertest.h',
         'browser/browsing_data_indexed_db_helper_browsertest.cc',
         'browser/browsing_data_local_storage_helper_browsertest.cc',
         'browser/chromeos/cros/cros_in_process_browser_test.cc',
         'browser/chromeos/cros/cros_in_process_browser_test.h',
         'browser/chromeos/cros/cros_mock.cc',
@@ skipping 120 matching lines @@
         'browser/in_process_webkit/indexed_db_browsertest.cc',
         'browser/net/cookie_policy_browsertest.cc',
         'browser/net/ftp_browsertest.cc',
         'browser/plugin_data_remover_browsertest.cc',
         'browser/policy/device_management_backend_mock.cc',
         'browser/policy/device_management_backend_mock.h',
         'browser/policy/device_management_service_browsertest.cc',
         'browser/popup_blocker_browsertest.cc',
         'browser/prerender/prerender_browsertest.cc',
         'browser/printing/print_dialog_cloud_uitest.cc',
-        'browser/renderer_host/test/render_process_host_browsertest.cc',
-        'browser/renderer_host/test/render_view_host_browsertest.cc',
-        'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
-        'browser/renderer_host/test/renderer_accessibility_browsertest.cc',
-        'browser/renderer_host/test/web_cache_manager_browsertest.cc',
+        'browser/renderer_host/web_cache_manager_browsertest.cc',
         'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
         'browser/safe_browsing/safe_browsing_service_browsertest.cc',
         'browser/service/service_process_control_browsertest.cc',
         'browser/sessions/session_restore_browsertest.cc',
         'browser/sessions/tab_restore_service_browsertest.cc',
         'browser/speech/speech_input_browsertest.cc',
         'browser/speech/speech_input_bubble_browsertest.cc',
         'browser/ssl/ssl_browser_tests.cc',
         'browser/task_manager/task_manager_browsertest.cc',
         'browser/ui/browser_init_browsertest.cc',
@@ skipping 32 matching lines @@
         'renderer/safe_browsing/render_view_fake_resources_test.cc',
         'renderer/safe_browsing/render_view_fake_resources_test.h',
         'renderer/translate_helper_browsertest.cc',
         'test/automation/dom_automation_browsertest.cc',
         'test/gpu/gpu_browsertest.cc',
         'test/out_of_proc_test_runner.cc',
         'test/render_view_test.cc',
         'test/render_view_test.h',
         '../content/browser/child_process_security_policy_browsertest.cc',
         '../content/browser/plugin_service_browsertest.cc',
+        '../content/browser/renderer_host/render_process_host_browsertest.cc',
+        '../content/browser/renderer_host/render_view_host_browsertest.cc',
+        '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
       ],
       'conditions': [
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
           'sources!': [
             'browser/webui/file_browse_browsertest.cc',
             'browser/webui/mediaplayer_browsertest.cc',
           ],
@@ skipping 53 matching lines @@
               },
             },
           }
         }, { # else: OS != "win"
           'sources!': [
             'app/chrome_command_ids.h',
             'app/chrome_dll.rc',
             'app/chrome_dll_resource.h',
             'app/chrome_dll_version.rc.version',
             'browser/extensions/extension_rlz_apitest.cc',
-            # TODO(jam): http://crbug.com/15101 These tests fail on Linux and
-            # Mac.
+            # http://crbug.com/15101 These tests fail on Linux and Mac.
+            'browser/renderer_host/web_cache_manager_browsertest.cc',
             '../content/browser/child_process_security_policy_browsertest.cc',
-            'browser/renderer_host/test/web_cache_manager_browsertest.cc',
-            'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
+            '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             # TODO(estade): port to win/mac.
@@ skipping 1367 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: