Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/base/base.gyp b/base/base.gyp
index 4aae198..c1116b3 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -468,8 +468,8 @@
'bits_unittest.cc',
'build_time_unittest.cc',
'callback_helpers_unittest.cc',
- 'callback_registry_unittest.cc',
- 'callback_registry_unittest.nc',
+ 'callback_list_unittest.cc',
+ 'callback_list_unittest.nc',
'callback_unittest.cc',
'callback_unittest.nc',
'cancelable_callback_unittest.cc',
@@ -888,6 +888,15 @@
'test/expectations/parser.h',
'test/gtest_xml_util.cc',
'test/gtest_xml_util.h',
+ 'test/launcher/parallel_test_launcher.cc',
+ 'test/launcher/parallel_test_launcher.h',
+ 'test/launcher/test_launcher.cc',
+ 'test/launcher/test_launcher.h',
+ 'test/launcher/test_results_tracker.cc',
+ 'test/launcher/test_results_tracker.h',
+ 'test/launcher/unit_test_launcher.cc',
+ 'test/launcher/unit_test_launcher.h',
+ 'test/launcher/unit_test_launcher_ios.cc',
'test/mock_chrome_application_mac.h',
'test/mock_chrome_application_mac.mm',
'test/mock_devices_changed_observer.cc',
@@ -899,16 +908,12 @@
'test/multiprocess_test_android.cc',
'test/null_task_runner.cc',
'test/null_task_runner.h',
- 'test/parallel_test_launcher.cc',
- 'test/parallel_test_launcher.h',
'test/perf_log.cc',
'test/perf_log.h',
'test/perf_test_suite.cc',
'test/perf_test_suite.h',
'test/perf_time_logger.cc',
'test/perf_time_logger.h',
- 'test/perftimer.cc',
- 'test/perftimer.h',
'test/power_monitor_test_base.cc',
'test/power_monitor_test_base.h',
'test/scoped_locale.cc',
@@ -931,8 +936,6 @@
'test/test_file_util_mac.cc',
'test/test_file_util_posix.cc',
'test/test_file_util_win.cc',
- 'test/test_launcher.cc',
- 'test/test_launcher.h',
'test/test_listener_ios.h',
'test/test_listener_ios.mm',
'test/test_pending_task.cc',
@@ -959,9 +962,6 @@
'test/thread_test_helper.h',
'test/trace_event_analyzer.cc',
'test/trace_event_analyzer.h',
- 'test/unit_test_launcher.cc',
- 'test/unit_test_launcher.h',
- 'test/unit_test_launcher_ios.cc',
'test/values_test_util.cc',
'test/values_test_util.h',
],
@@ -974,7 +974,7 @@
],
'sources!': [
# iOS uses its own unit test launcher.
- 'test/unit_test_launcher.cc',
+ 'test/launcher/unit_test_launcher.cc',
],
}],
], # target_conditions