| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index 41d43c84c06a224583cefb0cdd0c8e805afda1e7..fc16b983203b1b36e38eadddc889862e1a883290 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -494,10 +494,9 @@
|
| 'gmock_unittest.cc',
|
| 'guid_unittest.cc',
|
| 'hash_unittest.cc',
|
| - 'id_map_unittest.cc',
|
| 'i18n/break_iterator_unittest.cc',
|
| - 'i18n/char_iterator_unittest.cc',
|
| 'i18n/case_conversion_unittest.cc',
|
| + 'i18n/char_iterator_unittest.cc',
|
| 'i18n/file_util_icu_unittest.cc',
|
| 'i18n/icu_string_conversions_unittest.cc',
|
| 'i18n/number_formatting_unittest.cc',
|
| @@ -506,6 +505,7 @@
|
| 'i18n/string_search_unittest.cc',
|
| 'i18n/time_formatting_unittest.cc',
|
| 'i18n/timezone_unittest.cc',
|
| + 'id_map_unittest.cc',
|
| 'ios/device_util_unittest.mm',
|
| 'ios/weak_nsobject_unittest.mm',
|
| 'json/json_parser_unittest.cc',
|
| @@ -545,16 +545,17 @@
|
| 'message_loop/message_pump_glib_unittest.cc',
|
| 'message_loop/message_pump_io_ios_unittest.cc',
|
| 'message_loop/message_pump_libevent_unittest.cc',
|
| - 'metrics/sample_map_unittest.cc',
|
| - 'metrics/sample_vector_unittest.cc',
|
| 'metrics/bucket_ranges_unittest.cc',
|
| 'metrics/field_trial_unittest.cc',
|
| 'metrics/histogram_base_unittest.cc',
|
| 'metrics/histogram_delta_serialization_unittest.cc',
|
| 'metrics/histogram_snapshot_manager_unittest.cc',
|
| 'metrics/histogram_unittest.cc',
|
| + 'metrics/sample_map_unittest.cc',
|
| + 'metrics/sample_vector_unittest.cc',
|
| 'metrics/sparse_histogram_unittest.cc',
|
| 'metrics/statistics_recorder_unittest.cc',
|
| + 'numerics/safe_numerics_unittest.cc',
|
| 'observer_list_unittest.cc',
|
| 'os_compat_android_unittest.cc',
|
| 'path_service_unittest.cc',
|
| @@ -582,7 +583,6 @@
|
| 'process/process_util_unittest.cc',
|
| 'profiler/tracked_time_unittest.cc',
|
| 'rand_util_unittest.cc',
|
| - 'numerics/safe_numerics_unittest.cc',
|
| 'scoped_clear_errno_unittest.cc',
|
| 'scoped_generic_unittest.cc',
|
| 'scoped_native_library_unittest.cc',
|
| @@ -593,13 +593,13 @@
|
| 'strings/nullable_string16_unittest.cc',
|
| 'strings/safe_sprintf_unittest.cc',
|
| 'strings/string16_unittest.cc',
|
| - 'strings/stringprintf_unittest.cc',
|
| 'strings/string_number_conversions_unittest.cc',
|
| 'strings/string_piece_unittest.cc',
|
| 'strings/string_split_unittest.cc',
|
| 'strings/string_tokenizer_unittest.cc',
|
| 'strings/string_util_unittest.cc',
|
| 'strings/stringize_macros_unittest.cc',
|
| + 'strings/stringprintf_unittest.cc',
|
| 'strings/sys_string_conversions_mac_unittest.mm',
|
| 'strings/sys_string_conversions_unittest.cc',
|
| 'strings/utf_offset_string_conversions_unittest.cc',
|
| @@ -762,8 +762,8 @@
|
| 'sources!': [
|
| 'file_descriptor_shuffle_unittest.cc',
|
| 'files/dir_reader_posix_unittest.cc',
|
| - 'threading/worker_pool_posix_unittest.cc',
|
| 'message_loop/message_pump_libevent_unittest.cc',
|
| + 'threading/worker_pool_posix_unittest.cc',
|
| ],
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [
|
| @@ -835,9 +835,9 @@
|
| '../testing/gtest.gyp:gtest',
|
| ],
|
| 'sources': [
|
| - 'threading/thread_perftest.cc',
|
| 'message_loop/message_pump_perftest.cc',
|
| 'test/run_all_unittests.cc',
|
| + 'threading/thread_perftest.cc',
|
| '../testing/perf/perf_test.cc'
|
| ],
|
| 'conditions': [
|
| @@ -909,6 +909,8 @@
|
| 'test/gtest_util.h',
|
| 'test/gtest_xml_util.cc',
|
| 'test/gtest_xml_util.h',
|
| + 'test/histogram_tester.cc',
|
| + 'test/histogram_tester.h',
|
| 'test/launcher/test_launcher.cc',
|
| 'test/launcher/test_launcher.h',
|
| 'test/launcher/test_result.cc',
|
| @@ -949,8 +951,6 @@
|
| 'test/simple_test_clock.h',
|
| 'test/simple_test_tick_clock.cc',
|
| 'test/simple_test_tick_clock.h',
|
| - 'test/histogram_tester.cc',
|
| - 'test/histogram_tester.h',
|
| 'test/task_runner_test_template.cc',
|
| 'test/task_runner_test_template.h',
|
| 'test/test_file_util.cc',
|
|
|