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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 94974)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -164,8 +164,14 @@
         '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',
@@ -178,15 +184,9 @@
         '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',
@@ -507,6 +507,7 @@
         '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',
@@ -514,7 +515,6 @@
         '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', {
@@ -1984,15 +1984,15 @@
         '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',
@@ -2626,13 +2626,13 @@
         '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',
@@ -2880,7 +2880,7 @@
       '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', {
@@ -3496,10 +3496,10 @@
         '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',
@@ -3636,7 +3636,7 @@
       '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',
@@ -3759,7 +3759,7 @@
       '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',
       ],