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

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 20 matching lines @@
         'app/policy/cloud_policy_codegen.gyp:policy',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'theme_resources',
         'theme_resources_standard',
         '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_gpu',
         '../content/content.gyp:test_support_content',
         '../ipc/ipc.gyp:test_support_ipc',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
-        # 'test/test_url_request_context_getter.h' brings in this requirement.
+        # 'test/base/test_url_request_context_getter.h' brings in this requirement.
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'export_dependent_settings': [
         'renderer',
         'app/policy/cloud_policy_codegen.gyp:policy',
         '../base/base.gyp:test_support_base',
       ],
@@ skipping 86 matching lines @@
         'test/automation/extension_proxy.h',
         'test/automation/javascript_execution_controller.cc',
         'test/automation/javascript_execution_controller.h',
         'test/automation/javascript_message_utils.h',
         'test/automation/tab_proxy.cc',
         'test/automation/tab_proxy.h',
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
         'test/base/bookmark_load_observer.cc',
         'test/base/bookmark_load_observer.h',
+        'test/base/chrome_test_suite.cc',
+        'test/base/chrome_test_suite.h',
         'test/base/in_process_browser_test.cc',
         'test/base/in_process_browser_test.h',
         'test/base/model_test_utils.cc',
         'test/base/model_test_utils.h',
         '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_url_request_context_getter.cc',
+        'test/base/test_url_request_context_getter.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/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_mac.cc',
-        'test/test_browser_window.cc',
-        'test/test_browser_window.h',
-        'test/test_launcher_utils.cc',
-        'test/test_launcher_utils.h',
-        'test/test_location_bar.cc',
-        'test/test_location_bar.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/test_url_request_context_getter.cc',
-        'test/test_url_request_context_getter.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',
         'test/testing_profile.cc',
         'test/testing_profile.h',
         'test/thread_observer_helper.h',
-        'test/unit/chrome_test_suite.cc',
-        'test/unit/chrome_test_suite.h',
-        'test/values_test_util.cc',
-        'test/values_test_util.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 182 matching lines @@
         'test_support_common',
         'chrome_resources',
         'chrome_strings',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'test/unit/run_all_unittests.cc',
+        'test/base/run_all_unittests.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
-            #   test/unit/run_all_unittests.cc
-            #   test/unit/chrome_test_suite.h
+            #   test/base/run_all_unittests.cc
+            #   test/base/chrome_test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
     {
       'target_name': 'automated_ui_tests',
       'type': 'executable',
       'dependencies': [
@@ skipping 96 matching lines @@
         'browser/ui/views/tabs/tab_dragging_test.cc',
         'browser/ui/webui/workers_ui_browsertest.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',
-        'test/unit/chrome_test_suite.h',
       ],
       '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 1444 matching lines @@
         'renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc',
         'renderer/safe_browsing/phishing_url_feature_extractor_unittest.cc',
         '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/test_notification_tracker.cc',
+        'test/base/test_notification_tracker.h',
+        'test/base/v8_unit_test.cc',
+        'test/base/v8_unit_test.h',
         'test/browser_with_test_window_test.cc',
         'test/browser_with_test_window_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',
-        'test/test_notification_tracker.cc',
-        'test/test_notification_tracker.h',
-        'test/v8_unit_test.cc',
-        'test/v8_unit_test.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',
         '../content/browser/download/save_package_unittest.cc',
         '../content/browser/geolocation/device_data_provider_unittest.cc',
@@ skipping 1481 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/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',
@@ skipping 31 matching lines @@
         'test/live_sync/sync_datatype_helper.h',
         'test/live_sync/two_client_bookmarks_sync_test.cc',
         'test/live_sync/two_client_live_apps_sync_test.cc',
         'test/live_sync/two_client_live_autofill_sync_test.cc',
         'test/live_sync/two_client_live_extensions_sync_test.cc',
         'test/live_sync/two_client_live_passwords_sync_test.cc',
         'test/live_sync/two_client_live_sessions_sync_test.cc',
         'test/live_sync/two_client_live_themes_sync_test.cc',
         'test/live_sync/two_client_live_typed_urls_sync_test.cc',
         'test/live_sync/two_client_preferences_sync_test.cc',
-        'test/test_notification_tracker.cc',
-        'test/test_notification_tracker.h',
-        'test/data/resource.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:ssl',
            ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
@@ skipping 798 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'
 }