Move more files from chrome/test to chrome/test/base, part #5

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 146 matching lines @@
         'test/base/profile_mock.cc',
         'test/base/profile_mock.h',
         'test/base/signaling_task.cc',
         'test/base/signaling_task.h',
         'test/base/test_browser_window.cc',
         'test/base/test_browser_window.h',
         'test/base/test_launcher_utils.cc',
         'test/base/test_launcher_utils.h',
         'test/base/test_location_bar.cc',
         'test/base/test_location_bar.h',
+        'test/base/test_switches.cc',
+        'test/base/test_switches.h',
+        'test/base/test_tab_strip_model_observer.cc',
+        'test/base/test_tab_strip_model_observer.h',
         'test/base/test_url_request_context_getter.cc',
         'test/base/test_url_request_context_getter.h',
+        'test/base/testing_pref_service.cc',
+        'test/base/testing_pref_service.h',
         'test/base/testing_profile.cc',
         'test/base/testing_profile.h',
         'test/base/thread_observer_helper.h',
         'test/base/ui_test_utils.cc',
         'test/base/ui_test_utils.h',
         'test/base/ui_test_utils_linux.cc',
         'test/base/ui_test_utils_mac.mm',
         'test/base/ui_test_utils_win.cc',
         'test/base/values_test_util.cc',
         'test/base/values_test_util.h',
         'test/test_navigation_observer.cc',
         'test/test_navigation_observer.h',
-        'test/test_switches.cc',
-        'test/test_switches.h',
-        'test/test_tab_strip_model_observer.cc',
-        'test/test_tab_strip_model_observer.h',
         'test/testing_browser_process.cc',
         'test/testing_browser_process.h',
         'test/testing_browser_process_test.h',
-        'test/testing_pref_service.cc',
-        'test/testing_pref_service.h',
         '../content/browser/geolocation/arbitrator_dependency_factories_for_test.cc',
         '../content/browser/geolocation/arbitrator_dependency_factories_for_test.h',
         '../content/browser/geolocation/mock_location_provider.cc',
         '../content/browser/geolocation/mock_location_provider.h',
         '../content/browser/mock_content_browser_client.cc',
         '../content/browser/mock_resource_context.cc',
         '../content/browser/mock_resource_context.h',
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (in chrome.gyp).
         #'../content/browser/net/url_request_mock_http_job.cc',
@@ skipping 300 matching lines @@
         'browser/notifications/notifications_interactive_uitest.cc',
         'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
         'browser/ui/omnibox/omnibox_view_browsertest.cc',
         'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
         'browser/ui/views/button_dropdown_test.cc',
         'browser/ui/views/find_bar_host_interactive_uitest.cc',
         'browser/ui/views/menu_item_view_test.cc',
         'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
         'browser/ui/views/tabs/tab_dragging_test.cc',
         'browser/ui/webui/workers_ui_browsertest.cc',
+        'test/base/out_of_proc_test_runner.cc',
         'test/interactive_ui/fast_shutdown_interactive_uitest.cc',
         'test/interactive_ui/infobars_uitest.cc',
         'test/interactive_ui/keyboard_access_uitest.cc',
         'test/interactive_ui/mouseleave_interactive_uitest.cc',
         'test/interactive_ui/npapi_interactive_test.cc',
         'test/interactive_ui/view_event_test_base.cc',
         'test/interactive_ui/view_event_test_base.h',
-        'test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:ssl',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
@@ skipping 1449 matching lines @@
         'renderer/safe_browsing/scorer_unittest.cc',
         'renderer/spellchecker/spellcheck_provider_unittest.cc',
         'renderer/spellchecker/spellcheck_unittest.cc',
         'renderer/spellchecker/spellcheck_worditerator_unittest.cc',
         'service/cloud_print/cloud_print_helpers_unittest.cc',
         'service/cloud_print/cloud_print_token_store_unittest.cc',
         'service/cloud_print/cloud_print_url_fetcher_unittest.cc',
         'service/service_process_unittest.cc',
         'test/base/browser_with_test_window_test.cc',
         'test/base/browser_with_test_window_test.h',
+        'test/base/menu_model_test.cc',
+        'test/base/menu_model_test.h',
+        'test/base/render_view_test.cc',
+        'test/base/render_view_test.h',
         'test/base/test_notification_tracker.cc',
         'test/base/test_notification_tracker.h',
         'test/base/v8_unit_test.cc',
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
-        'test/menu_model_test.cc',
-        'test/menu_model_test.h',
-        'test/render_view_test.cc',
-        'test/render_view_test.h',
         'test/sync/test_http_bridge_factory.cc',
         'test/sync/test_http_bridge_factory.h',
         'tools/convert_dict/convert_dict_unittest.cc',
         '../content/browser/appcache/chrome_appcache_service_unittest.cc',
         '../content/browser/browser_thread_unittest.cc',
         '../content/browser/browser_url_handler_unittest.cc',
         '../content/browser/child_process_security_policy_unittest.cc',
         '../content/browser/debugger/devtools_manager_unittest.cc',
         '../content/browser/device_orientation/provider_unittest.cc',
         '../content/browser/download/base_file_unittest.cc',
@@ skipping 613 matching lines @@
         'renderer/safe_browsing/malware_dom_details_browsertest.cc',
         'renderer/safe_browsing/phishing_classifier_browsertest.cc',
         'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
         'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
         'renderer/safe_browsing/phishing_thumbnailer_browsertest.cc',
         '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/base/in_process_browser_test_browsertest.cc',
+        'test/base/render_view_test.cc',
+        'test/base/render_view_test.h',
+        'test/base/out_of_proc_test_runner.cc',
         'test/data/webui/assertions-inl.h',
         'test/data/webui/assertions.js',
         'test/data/webui/print_preview.js',
         'test/data/webui/options.js',
-        'test/out_of_proc_test_runner.cc',
-        'test/render_view_test.cc',
-        'test/render_view_test.h',
         # TODO(craig): Rename this and run from base_unittests when the test
         # is safe to run there. See http://crbug.com/78722 for details.
         '../base/files/file_path_watcher_browsertest.cc',
         '../content/browser/child_process_security_policy_browsertest.cc',
         '../content/browser/device_orientation/device_orientation_browsertest.cc',
         '../content/browser/download/mhtml_generation_browsertest.cc',
         '../content/browser/in_process_webkit/dom_storage_browsertest.cc',
         '../content/browser/in_process_webkit/indexed_db_browsertest.cc',
         '../content/browser/plugin_service_browsertest.cc',
         '../content/browser/renderer_host/render_process_host_browsertest.cc',
@@ skipping 227 matching lines @@
         '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
         '../ui/ui.gyp:ui_resources',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
-        'test/out_of_proc_test_runner.cc',
+        'test/base/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['safe_browsing==0', {
           'sources!': [
             'browser/safe_browsing/safe_browsing_test.cc',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             'chrome_version_resources',
@@ skipping 595 matching lines @@
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
+        'test/base/out_of_proc_test_runner.cc',
         'test/base/test_notification_tracker.cc',
         'test/base/test_notification_tracker.h',
         'test/data/resource.rc',
-        'test/out_of_proc_test_runner.cc',
         'test/live_sync/bookmarks_helper.cc',
         'test/live_sync/bookmarks_helper.h',
         'test/live_sync/live_apps_sync_test.cc',
         'test/live_sync/live_apps_sync_test.h',
         'test/live_sync/live_autofill_sync_test.cc',
         'test/live_sync/live_autofill_sync_test.h',
         'test/live_sync/live_extensions_sync_test.cc',
         'test/live_sync/live_extensions_sync_test.h',
         'test/live_sync/live_passwords_sync_test.cc',
         'test/live_sync/live_passwords_sync_test.h',
@@ skipping 116 matching lines @@
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'browser/password_manager/password_form_data.cc',
-        'test/out_of_proc_test_runner.cc',
+        'test/base/out_of_proc_test_runner.cc',
         'test/live_sync/bookmarks_helper.cc',
         'test/live_sync/bookmarks_helper.h',
         'test/live_sync/live_autofill_sync_test.cc',
         'test/live_sync/live_autofill_sync_test.h',
         'test/live_sync/live_extensions_sync_test.cc',
         'test/live_sync/live_extensions_sync_test.h',
         'test/live_sync/live_passwords_sync_test.cc',
         'test/live_sync/live_passwords_sync_test.h',
         'test/live_sync/live_typed_urls_sync_test.cc',
         'test/live_sync/live_typed_urls_sync_test.h',
@@ skipping 102 matching lines @@
         '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'include_dirs': [
         '..',
         '<(test_list_out_dir)',
       ],
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'browser/gpu_pixel_browsertest.cc',
         'browser/gpu_crash_browsertest.cc',
-        'test/out_of_proc_test_runner.cc',
+        'test/base/out_of_proc_test_runner.cc',
         'test/gpu/webgl_conformance_tests.cc',
         '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h',
       ],
       # hard_dependency is necessary for this target because it has actions
       # that generate a header file included by dependent targets. The header
       # file must be generated before the dependents are compiled. The usual
       # semantics are to allow the two targets to build concurrently.
       'hard_dependency': 1,
       'actions': [
         {
@@ skipping 589 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }