diff options
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/base/base.gyp b/base/base.gyp index 075561b..6dc450c 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# 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. @@ -65,9 +65,7 @@ 'base64_unittest.cc', 'bits_unittest.cc', 'callback_unittest.cc', - 'cancellation_flag_unittest.cc', 'command_line_unittest.cc', - 'condition_variable_unittest.cc', 'crypto/encryptor_unittest.cc', 'crypto/rsa_private_key_unittest.cc', 'crypto/rsa_private_key_nss_unittest.cc', @@ -97,22 +95,18 @@ 'lazy_instance_unittest.cc', 'linked_list_unittest.cc', 'linked_ptr_unittest.cc', - 'lock_unittest.cc', 'logging_unittest.cc', - 'mac_util_unittest.mm', + 'mac/mac_util_unittest.mm', 'message_loop_proxy_impl_unittest.cc', 'message_loop_unittest.cc', 'message_pump_glib_unittest.cc', 'metrics/field_trial_unittest.cc', 'metrics/histogram_unittest.cc', 'metrics/stats_table_unittest.cc', - 'non_thread_safe_unittest.cc', - 'object_watcher_unittest.cc', 'observer_list_unittest.cc', 'path_service_unittest.cc', 'pickle_unittest.cc', 'platform_file_unittest.cc', - 'platform_thread_unittest.cc', 'pr_time_unittest.cc', 'process_util_unittest.cc', 'process_util_unittest_mac.h', @@ -125,7 +119,6 @@ 'sha1_unittest.cc', 'sha2_unittest.cc', 'shared_memory_unittest.cc', - 'simple_thread_unittest.cc', 'singleton_unittest.cc', 'stack_container_unittest.cc', 'string16_unittest.cc', @@ -136,16 +129,27 @@ 'string_util_unittest.cc', 'stringize_macros_unittest.cc', 'stringprintf_unittest.cc', + 'synchronization/cancellation_flag_unittest.cc', + 'synchronization/condition_variable_unittest.cc', + 'synchronization/lock_unittest.cc', + 'synchronization/waitable_event_unittest.cc', + 'synchronization/waitable_event_watcher_unittest.cc', 'sys_info_unittest.cc', 'sys_string_conversions_mac_unittest.mm', 'sys_string_conversions_unittest.cc', 'task_queue_unittest.cc', 'task_unittest.cc', - 'thread_checker_unittest.cc', - 'thread_collision_warner_unittest.cc', - 'thread_local_storage_unittest.cc', - 'thread_local_unittest.cc', - 'thread_unittest.cc', + 'threading/non_thread_safe_unittest.cc', + 'threading/platform_thread_unittest.cc', + 'threading/simple_thread_unittest.cc', + 'threading/thread_checker_unittest.cc', + 'threading/thread_collision_warner_unittest.cc', + 'threading/thread_local_storage_unittest.cc', + 'threading/thread_local_unittest.cc', + 'threading/thread_unittest.cc', + 'threading/watchdog_unittest.cc', + 'threading/worker_pool_posix_unittest.cc', + 'threading/worker_pool_unittest.cc', 'time_unittest.cc', 'time_win_unittest.cc', 'timer_unittest.cc', @@ -157,22 +161,18 @@ 'values_unittest.cc', 'version_unittest.cc', 'vlog_unittest.cc', - 'waitable_event_unittest.cc', - 'waitable_event_watcher_unittest.cc', - 'watchdog_unittest.cc', 'weak_ptr_unittest.cc', - 'win_util_unittest.cc', 'win/event_trace_consumer_unittest.cc', 'win/event_trace_controller_unittest.cc', 'win/event_trace_provider_unittest.cc', 'win/i18n_unittest.cc', + 'win/object_watcher_unittest.cc', 'win/pe_image_unittest.cc', 'win/registry_unittest.cc', 'win/scoped_bstr_unittest.cc', 'win/scoped_comptr_unittest.cc', 'win/scoped_variant_unittest.cc', - 'worker_pool_posix_unittest.cc', - 'worker_pool_unittest.cc', + 'win/win_util_unittest.cc', ], 'dependencies': [ 'base', @@ -217,14 +217,13 @@ 'sources!': [ 'dir_reader_posix_unittest.cc', 'file_descriptor_shuffle_unittest.cc', - 'worker_pool_posix_unittest.cc', + 'threading/worker_pool_posix_unittest.cc', ], }, { # OS != "win" 'sources/': [ ['exclude', '^win/'], ], 'sources!': [ - 'object_watcher_unittest.cc', 'system_monitor_unittest.cc', 'time_win_unittest.cc', 'trace_event_win_unittest.cc', |