diff options
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ada1856..3d806af 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -38,7 +38,7 @@ '../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', @@ -145,6 +145,8 @@ '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', @@ -153,28 +155,30 @@ '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', @@ -183,10 +187,6 @@ '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', @@ -389,14 +389,14 @@ '..', ], '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', ], @@ -513,7 +513,6 @@ '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', { @@ -1978,6 +1977,10 @@ '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', @@ -1987,10 +1990,6 @@ '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', @@ -3492,6 +3491,9 @@ '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', @@ -3543,9 +3545,6 @@ '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', { |