diff options
114 files changed, 163 insertions, 166 deletions
diff --git a/base/base.gyp b/base/base.gyp index 50a19ee..6dc450c 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -65,7 +65,6 @@ 'base64_unittest.cc', 'bits_unittest.cc', 'callback_unittest.cc', - 'cancellation_flag_unittest.cc', 'command_line_unittest.cc', 'crypto/encryptor_unittest.cc', 'crypto/rsa_private_key_unittest.cc', @@ -130,8 +129,11 @@ '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', @@ -159,8 +161,6 @@ 'values_unittest.cc', 'version_unittest.cc', 'vlog_unittest.cc', - 'waitable_event_unittest.cc', - 'waitable_event_watcher_unittest.cc', 'weak_ptr_unittest.cc', 'win/event_trace_consumer_unittest.cc', 'win/event_trace_controller_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index 4147e68..3d650dc 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -39,8 +39,6 @@ 'bits.h', 'bzip2_error_handler.cc', 'callback.h', - 'cancellation_flag.cc', - 'cancellation_flag.h', 'command_line.cc', 'command_line.h', 'compiler_specific.h', @@ -209,6 +207,8 @@ 'stringize_macros.h', 'stringprintf.cc', 'stringprintf.h', + 'synchronization/cancellation_flag.cc', + 'synchronization/cancellation_flag.h', 'synchronization/condition_variable.h', 'synchronization/condition_variable_posix.cc', 'synchronization/condition_variable_win.cc', @@ -217,6 +217,12 @@ 'synchronization/lock_impl.h', 'synchronization/lock_impl_posix.cc', 'synchronization/lock_impl_win.cc', + 'synchronization/waitable_event.h', + 'synchronization/waitable_event_posix.cc', + 'synchronization/waitable_event_watcher.h', + 'synchronization/waitable_event_watcher_posix.cc', + 'synchronization/waitable_event_watcher_win.cc', + 'synchronization/waitable_event_win.cc', 'sys_info.h', 'sys_info_chromeos.cc', 'sys_info_freebsd.cc', @@ -286,12 +292,6 @@ 'version.h', 'vlog.cc', 'vlog.h', - 'waitable_event.h', - 'waitable_event_posix.cc', - 'waitable_event_watcher.h', - 'waitable_event_watcher_posix.cc', - 'waitable_event_watcher_win.cc', - 'waitable_event_win.cc', 'weak_ptr.cc', 'weak_ptr.h', 'win/i18n.cc', diff --git a/base/message_pump_default.h b/base/message_pump_default.h index 3dfbf1c..5030aa9 100644 --- a/base/message_pump_default.h +++ b/base/message_pump_default.h @@ -8,7 +8,7 @@ #include "base/message_pump.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" namespace base { diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index c5cc8c3..9d0ba58 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -25,10 +25,10 @@ #include "base/process_util.h" #include "base/scoped_ptr.h" #include "base/stringprintf.h" +#include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/waitable_event.h" #if defined(OS_MACOSX) #include <crt_externs.h> diff --git a/base/cancellation_flag.cc b/base/synchronization/cancellation_flag.cc index 50e30ec..ad3b551 100644 --- a/base/cancellation_flag.cc +++ b/base/synchronization/cancellation_flag.cc @@ -1,8 +1,8 @@ -// 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. -#include "base/cancellation_flag.h" +#include "base/synchronization/cancellation_flag.h" #include "base/logging.h" diff --git a/base/cancellation_flag.h b/base/synchronization/cancellation_flag.h index b4fddb2..29ecd89 100644 --- a/base/cancellation_flag.h +++ b/base/synchronization/cancellation_flag.h @@ -1,9 +1,9 @@ -// 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. -#ifndef BASE_CANCELLATION_FLAG_H_ -#define BASE_CANCELLATION_FLAG_H_ +#ifndef BASE_SYNCHRONIZATION_CANCELLATION_FLAG_H_ +#define BASE_SYNCHRONIZATION_CANCELLATION_FLAG_H_ #pragma once #include "base/atomicops.h" @@ -40,4 +40,4 @@ class CancellationFlag { } // namespace base -#endif // BASE_CANCELLATION_FLAG_H_ +#endif // BASE_SYNCHRONIZATION_CANCELLATION_FLAG_H_ diff --git a/base/cancellation_flag_unittest.cc b/base/synchronization/cancellation_flag_unittest.cc index 9c9ffd7..c405c79 100644 --- a/base/cancellation_flag_unittest.cc +++ b/base/synchronization/cancellation_flag_unittest.cc @@ -1,10 +1,10 @@ -// 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. // Tests of CancellationFlag class. -#include "base/cancellation_flag.h" +#include "base/synchronization/cancellation_flag.h" #include "base/logging.h" #include "base/message_loop.h" @@ -14,9 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -using base::CancellationFlag; -using base::TimeDelta; -using base::Thread; +namespace base { namespace { @@ -65,3 +63,5 @@ TEST(CancellationFlagTest, SetOnDifferentThreadDeathTest) { } } // namespace + +} // namespace base diff --git a/base/waitable_event.h b/base/synchronization/waitable_event.h index 081ad66..70b9da0 100644 --- a/base/waitable_event.h +++ b/base/synchronization/waitable_event.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 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. -#ifndef BASE_WAITABLE_EVENT_H_ -#define BASE_WAITABLE_EVENT_H_ +#ifndef BASE_SYNCHRONIZATION_WAITABLE_EVENT_H_ +#define BASE_SYNCHRONIZATION_WAITABLE_EVENT_H_ #pragma once #include "base/basictypes.h" @@ -176,4 +176,4 @@ class WaitableEvent { } // namespace base -#endif // BASE_WAITABLE_EVENT_H_ +#endif // BASE_SYNCHRONIZATION_WAITABLE_EVENT_H_ diff --git a/base/waitable_event_posix.cc b/base/synchronization/waitable_event_posix.cc index f6a6aab..9cbc03a 100644 --- a/base/waitable_event_posix.cc +++ b/base/synchronization/waitable_event_posix.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" diff --git a/base/waitable_event_unittest.cc b/base/synchronization/waitable_event_unittest.cc index b4f1991..47e7ff7 100644 --- a/base/waitable_event_unittest.cc +++ b/base/synchronization/waitable_event_unittest.cc @@ -1,18 +1,13 @@ -// 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. #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "testing/gtest/include/gtest/gtest.h" -using base::TimeDelta; -using base::WaitableEvent; - -namespace { -typedef testing::Test WaitableEventTest; -} +namespace base { TEST(WaitableEventTest, ManualBasics) { WaitableEvent event(true, false); @@ -74,7 +69,7 @@ TEST(WaitableEventTest, WaitManyShortcut) { delete ev[i]; } -class WaitableEventSignaler : public base::PlatformThread::Delegate { +class WaitableEventSignaler : public PlatformThread::Delegate { public: WaitableEventSignaler(double seconds, WaitableEvent* ev) : seconds_(seconds), @@ -82,7 +77,7 @@ class WaitableEventSignaler : public base::PlatformThread::Delegate { } void ThreadMain() { - base::PlatformThread::Sleep(static_cast<int>(seconds_ * 1000)); + PlatformThread::Sleep(static_cast<int>(seconds_ * 1000)); ev_->Signal(); } @@ -97,13 +92,15 @@ TEST(WaitableEventTest, WaitMany) { ev[i] = new WaitableEvent(false, false); WaitableEventSignaler signaler(0.1, ev[2]); - base::PlatformThreadHandle thread; - base::PlatformThread::Create(0, &signaler, &thread); + PlatformThreadHandle thread; + PlatformThread::Create(0, &signaler, &thread); EXPECT_EQ(WaitableEvent::WaitMany(ev, 5), 2u); - base::PlatformThread::Join(thread); + PlatformThread::Join(thread); for (unsigned i = 0; i < 5; ++i) delete ev[i]; } + +} // namespace base diff --git a/base/waitable_event_watcher.h b/base/synchronization/waitable_event_watcher.h index c54419e..e396368 100644 --- a/base/waitable_event_watcher.h +++ b/base/synchronization/waitable_event_watcher.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2008 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. -#ifndef BASE_WAITABLE_EVENT_WATCHER_H_ -#define BASE_WAITABLE_EVENT_WATCHER_H_ +#ifndef BASE_SYNCHRONIZATION_WAITABLE_EVENT_WATCHER_H_ +#define BASE_SYNCHRONIZATION_WAITABLE_EVENT_WATCHER_H_ #pragma once #include "build/build_config.h" @@ -12,7 +12,7 @@ #include "base/win/object_watcher.h" #else #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #endif namespace base { @@ -159,4 +159,4 @@ class WaitableEventWatcher } // namespace base -#endif // BASE_WAITABLE_EVENT_WATCHER_H_ +#endif // BASE_SYNCHRONIZATION_WAITABLE_EVENT_WATCHER_H_ diff --git a/base/waitable_event_watcher_posix.cc b/base/synchronization/waitable_event_watcher_posix.cc index 148caaa..048bbd0 100644 --- a/base/waitable_event_watcher_posix.cc +++ b/base/synchronization/waitable_event_watcher_posix.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event_watcher.h" #include "base/message_loop.h" #include "base/synchronization/lock.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" namespace base { diff --git a/base/waitable_event_watcher_unittest.cc b/base/synchronization/waitable_event_watcher_unittest.cc index 6073861..1715dff 100644 --- a/base/waitable_event_watcher_unittest.cc +++ b/base/synchronization/waitable_event_watcher_unittest.cc @@ -1,15 +1,14 @@ -// 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. #include "base/message_loop.h" +#include "base/synchronization/waitable_event.h" +#include "base/synchronization/waitable_event_watcher.h" #include "base/threading/platform_thread.h" -#include "base/waitable_event.h" -#include "base/waitable_event_watcher.h" #include "testing/gtest/include/gtest/gtest.h" -using base::WaitableEvent; -using base::WaitableEventWatcher; +namespace base { namespace { @@ -162,3 +161,5 @@ TEST(WaitableEventWatcherTest, MAYBE_DeleteUnder) { RunTest_DeleteUnder(MessageLoop::TYPE_IO); RunTest_DeleteUnder(MessageLoop::TYPE_UI); } + +} // namespace base diff --git a/base/waitable_event_watcher_win.cc b/base/synchronization/waitable_event_watcher_win.cc index d1fb5d2..9c02a4c 100644 --- a/base/waitable_event_watcher_win.cc +++ b/base/synchronization/waitable_event_watcher_win.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2006-2008 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. -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event_watcher.h" #include "base/compiler_specific.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/win/object_watcher.h" namespace base { diff --git a/base/waitable_event_win.cc b/base/synchronization/waitable_event_win.cc index 3d0eb14..0fcf488 100644 --- a/base/waitable_event_win.cc +++ b/base/synchronization/waitable_event_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 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. -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include <math.h> #include <windows.h> diff --git a/base/threading/simple_thread.h b/base/threading/simple_thread.h index c401e01..b107e9c 100644 --- a/base/threading/simple_thread.h +++ b/base/threading/simple_thread.h @@ -48,7 +48,7 @@ #include "base/basictypes.h" #include "base/lock.h" #include "base/threading/platform_thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" namespace base { diff --git a/base/threading/simple_thread_unittest.cc b/base/threading/simple_thread_unittest.cc index 56aed6b..4014d70 100644 --- a/base/threading/simple_thread_unittest.cc +++ b/base/threading/simple_thread_unittest.cc @@ -5,7 +5,7 @@ #include "base/atomic_sequence_num.h" #include "base/string_number_conversions.h" #include "base/threading/simple_thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/threading/thread.cc b/base/threading/thread.cc index 5772d32..09f8847 100644 --- a/base/threading/thread.cc +++ b/base/threading/thread.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/thread_local.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" namespace base { diff --git a/base/threading/thread_local_unittest.cc b/base/threading/thread_local_unittest.cc index f6bdd78..ba12898 100644 --- a/base/threading/thread_local_unittest.cc +++ b/base/threading/thread_local_unittest.cc @@ -5,7 +5,7 @@ #include "base/logging.h" #include "base/threading/simple_thread.h" #include "base/threading/thread_local.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/threading/worker_pool_posix_unittest.cc b/base/threading/worker_pool_posix_unittest.cc index 9be82c0..332c55e 100644 --- a/base/threading/worker_pool_posix_unittest.cc +++ b/base/threading/worker_pool_posix_unittest.cc @@ -10,7 +10,7 @@ #include "base/synchronization/condition_variable.h" #include "base/task.h" #include "base/threading/platform_thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc index cf8e0e8..f044e10 100644 --- a/base/threading/worker_pool_unittest.cc +++ b/base/threading/worker_pool_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/threading/worker_pool.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index 21d889d..582a42d 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -14,7 +14,7 @@ #include "base/scoped_comptr_win.h" #include "base/scoped_handle_win.h" #include "base/scoped_native_library.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 67d4af2..0c15995 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -23,7 +23,7 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/automation/automation_autocomplete_edit_tracker.h" diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 09a3cff..3155103 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -15,7 +15,7 @@ #include "base/lock.h" #include "base/observer_list.h" #include "base/string16.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_service.h" #include "chrome/browser/cancelable_request.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 99cec2f..482f547 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -14,7 +14,7 @@ #include "base/task.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/appcache/chrome_appcache_service.h" #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/browser_child_process_host.h" diff --git a/chrome/browser/cancelable_request.cc b/chrome/browser/cancelable_request.cc index 4ed58f8..3fdb482 100644 --- a/chrome/browser/cancelable_request.cc +++ b/chrome/browser/cancelable_request.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -13,7 +13,7 @@ CancelableRequestProvider::~CancelableRequestProvider() { // deleted, or do other bad things. This can occur on shutdown (or profile // destruction) when a request is scheduled, completed (but not dispatched), // then the Profile is deleted. - AutoLock lock(pending_request_lock_); + base::AutoLock lock(pending_request_lock_); while (!pending_requests_.empty()) CancelRequestLocked(pending_requests_.begin()); } @@ -23,7 +23,7 @@ CancelableRequestProvider::Handle CancelableRequestProvider::AddRequest( CancelableRequestConsumerBase* consumer) { Handle handle; { - AutoLock lock(pending_request_lock_); + base::AutoLock lock(pending_request_lock_); handle = next_handle_; pending_requests_[next_handle_] = request; @@ -37,7 +37,7 @@ CancelableRequestProvider::Handle CancelableRequestProvider::AddRequest( } void CancelableRequestProvider::CancelRequest(Handle handle) { - AutoLock lock(pending_request_lock_); + base::AutoLock lock(pending_request_lock_); CancelRequestLocked(pending_requests_.find(handle)); } @@ -57,7 +57,7 @@ void CancelableRequestProvider::CancelRequestLocked( void CancelableRequestProvider::RequestCompleted(Handle handle) { CancelableRequestConsumerBase* consumer = NULL; { - AutoLock lock(pending_request_lock_); + base::AutoLock lock(pending_request_lock_); CancelableRequestMap::iterator i = pending_requests_.find(handle); if (i == pending_requests_.end()) { diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h index 3ad7261..5f2b1c7 100644 --- a/chrome/browser/cancelable_request.h +++ b/chrome/browser/cancelable_request.h @@ -92,12 +92,12 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/cancellation_flag.h" #include "base/lock.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "base/synchronization/cancellation_flag.h" #include "base/task.h" #include "build/build_config.h" @@ -148,7 +148,7 @@ class CancelableRequestProvider { friend class CancelableRequestBase; - Lock pending_request_lock_; + base::Lock pending_request_lock_; // Lists all outstanding requests. Protected by the |lock_|. CancelableRequestMap pending_requests_; diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc index 654c48c..dc75bad 100644 --- a/chrome/browser/dom_ui/bug_report_ui.cc +++ b/chrome/browser/dom_ui/bug_report_ui.cc @@ -51,7 +51,7 @@ #if defined(OS_CHROMEOS) #include "base/file_util.h" #include "base/path_service.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/syslogs_library.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc b/chrome/browser/dom_ui/dom_ui_screenshot_source.cc index 215876f..7efbae8 100644 --- a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc +++ b/chrome/browser/dom_ui/dom_ui_screenshot_source.cc @@ -10,7 +10,7 @@ #include "base/ref_counted_memory.h" #include "base/task.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/file_path_watcher/file_path_watcher_browsertest.cc b/chrome/browser/file_path_watcher/file_path_watcher_browsertest.cc index d90a522..b733a9a 100644 --- a/chrome/browser/file_path_watcher/file_path_watcher_browsertest.cc +++ b/chrome/browser/file_path_watcher/file_path_watcher_browsertest.cc @@ -15,7 +15,7 @@ #include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/stl_util-inl.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/in_process_webkit/indexed_db_key_utility_client.h b/chrome/browser/in_process_webkit/indexed_db_key_utility_client.h index 6b8aec1..3a79c28 100644 --- a/chrome/browser/in_process_webkit/indexed_db_key_utility_client.h +++ b/chrome/browser/in_process_webkit/indexed_db_key_utility_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/utility_process_host.h" class IndexedDBKey; diff --git a/chrome/browser/net/chrome_net_log_unittest.cc b/chrome/browser/net/chrome_net_log_unittest.cc index b87895b..dead901 100644 --- a/chrome/browser/net/chrome_net_log_unittest.cc +++ b/chrome/browser/net/chrome_net_log_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/net/chrome_net_log.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/threading/simple_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index fef104d..58a443d 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc index 89b3fc3..9296cfa 100644 --- a/chrome/browser/net/predictor_api.cc +++ b/chrome/browser/net/predictor_api.cc @@ -13,7 +13,7 @@ #include "base/string_number_conversions.h" #include "base/threading/thread.h" #include "base/values.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc index 4532dd2..64ad3fc 100644 --- a/chrome/browser/notifications/desktop_notification_service_unittest.cc +++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc index 116da64..576cd89 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc @@ -17,7 +17,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 537b134..255a092 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -8,7 +8,7 @@ #include "base/scoped_temp_dir.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_default.h" #include "chrome/browser/password_manager/password_form_data.h" diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 824f37a..9c692b6 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -12,7 +12,7 @@ #include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_win.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index eb9f5b3..94aadfc 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -7,7 +7,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_x.h" diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index 9941233..0c8ee4c 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -12,7 +12,7 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/chrome_plugin_host.h" diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h index a66d76ac..8494fda 100644 --- a/chrome/browser/plugin_service.h +++ b/chrome/browser/plugin_service.h @@ -15,7 +15,7 @@ #include "base/file_path.h" #include "base/hash_tables.h" #include "base/singleton.h" -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event_watcher.h" #include "chrome/browser/plugin_process_host.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/policy/configuration_policy_loader_win.h b/chrome/browser/policy/configuration_policy_loader_win.h index 65319fe..5fa804d 100644 --- a/chrome/browser/policy/configuration_policy_loader_win.h +++ b/chrome/browser/policy/configuration_policy_loader_win.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_LOADER_WIN_H_ #pragma once -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/win/object_watcher.h" #include "chrome/browser/policy/asynchronous_policy_loader.h" diff --git a/chrome/browser/policy/device_token_fetcher.h b/chrome/browser/policy/device_token_fetcher.h index c36af5b..f047e61 100644 --- a/chrome/browser/policy/device_token_fetcher.h +++ b/chrome/browser/policy/device_token_fetcher.h @@ -12,7 +12,7 @@ #include "base/file_path.h" #include "base/observer_list.h" #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/policy/device_management_backend.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc index 9bb596b4..235f181 100644 --- a/chrome/browser/process_singleton_uitest.cc +++ b/chrome/browser/process_singleton_uitest.cc @@ -19,7 +19,7 @@ #include "base/ref_counted.h" #include "base/scoped_temp_dir.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h index 6d3dcfa..882a349 100644 --- a/chrome/browser/renderer_host/render_widget_helper.h +++ b/chrome/browser/renderer_host/render_widget_helper.h @@ -14,7 +14,7 @@ #include "base/process.h" #include "base/ref_counted.h" #include "base/lock.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/window_container_type.h" #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h" diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h index 09b55df..22531d8 100644 --- a/chrome/browser/sync/engine/syncer_thread.h +++ b/chrome/browser/sync/engine/syncer_thread.h @@ -20,7 +20,7 @@ #include "base/synchronization/condition_variable.h" #include "base/threading/thread.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/engine/syncer_types.h" #include "chrome/browser/sync/sessions/sync_session.h" #include "chrome/browser/sync/syncable/model_type.h" diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc index 887bcc1..df0733b 100644 --- a/chrome/browser/sync/engine/syncer_thread_unittest.cc +++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc @@ -8,7 +8,7 @@ #include "base/lock.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/engine/syncer_thread.h" #include "chrome/browser/sync/engine/syncer_types.h" diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.h b/chrome/browser/sync/glue/autofill_data_type_controller.h index d73edf2..2daedb42 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller.h +++ b/chrome/browser/sync/glue/autofill_data_type_controller.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/sync/profile_sync_factory.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index 6ff8af6..127b591 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/sync/glue/autofill_data_type_controller.h" diff --git a/chrome/browser/sync/glue/database_model_worker.cc b/chrome/browser/sync/glue/database_model_worker.cc index b09c6c6..91bba5b 100644 --- a/chrome/browser/sync/glue/database_model_worker.cc +++ b/chrome/browser/sync/glue/database_model_worker.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/glue/database_model_worker.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" using base::WaitableEvent; diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc index 9b0ea509..e880476 100644 --- a/chrome/browser/sync/glue/history_model_worker.cc +++ b/chrome/browser/sync/glue/history_model_worker.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/history/history.h" using base::WaitableEvent; diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h index 530c215..bb6e597 100644 --- a/chrome/browser/sync/glue/http_bridge.h +++ b/chrome/browser/sync/glue/http_bridge.h @@ -9,7 +9,7 @@ #include <string> #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/url_request_context_getter.h" diff --git a/chrome/browser/sync/glue/password_model_worker.cc b/chrome/browser/sync/glue/password_model_worker.cc index c06f33f..6132a03 100644 --- a/chrome/browser/sync/glue/password_model_worker.cc +++ b/chrome/browser/sync/glue/password_model_worker.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/ref_counted.h" #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/password_manager/password_store.h" using base::WaitableEvent; diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc index 9ba5cdd..38f4a98 100644 --- a/chrome/browser/sync/glue/ui_model_worker.cc +++ b/chrome/browser/sync/glue/ui_model_worker.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc index 28f9b53..a2a1dde 100644 --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/glue/ui_model_worker.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index a7b929a..e543319 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -16,7 +16,7 @@ #include "base/task.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/autofill/autofill_common_test.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" diff --git a/chrome/browser/sync/profile_sync_test_util.h b/chrome/browser/sync/profile_sync_test_util.h index 2dfdbbd..4e28efa 100644 --- a/chrome/browser/sync/profile_sync_test_util.h +++ b/chrome/browser/sync/profile_sync_test_util.h @@ -14,7 +14,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/webdata/web_database.h" diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc index d5f88d4..b85256e 100644 --- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/string_util.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/values.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_bookmarks_module.h" diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index d56aebf..98a277c 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -17,7 +17,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/common/child_process.h b/chrome/common/child_process.h index ee32c93..c656317 100644 --- a/chrome/common/child_process.h +++ b/chrome/common/child_process.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" class ChildThread; diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc index 47ba221..1618892 100644 --- a/chrome/common/net/url_fetcher_unittest.cc +++ b/chrome/common/net/url_fetcher_unittest.cc @@ -4,7 +4,7 @@ #include "base/message_loop_proxy.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "build/build_config.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/net/url_fetcher.h" diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc index fc789353..17f217d 100644 --- a/chrome/plugin/plugin_channel.cc +++ b/chrome/plugin/plugin_channel.cc @@ -8,7 +8,7 @@ #include "base/lock.h" #include "base/process_util.h" #include "base/string_util.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "build/build_config.h" #include "chrome/common/child_process.h" #include "chrome/common/plugin_messages.h" diff --git a/chrome/renderer/cookie_message_filter.h b/chrome/renderer/cookie_message_filter.h index 1a32e86..051ba62 100644 --- a/chrome/renderer/cookie_message_filter.h +++ b/chrome/renderer/cookie_message_filter.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_COOKIE_MESSAGE_FILTER_H_ #pragma once -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_channel_proxy.h" // This class maintains a WaitableEvent that is signaled when an IPC to query diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index 95ac11b..be3b8aa 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop_proxy.h" #include "base/ref_counted.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/service/service_process.h" #include "chrome/service/cloud_print/cloud_print_url_fetcher.h" diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h index ac75619..5d2813a 100644 --- a/chrome/service/gaia/service_gaia_authenticator.h +++ b/chrome/service/gaia/service_gaia_authenticator.h @@ -9,7 +9,7 @@ #include <string> #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/gaia/gaia_authenticator.h" diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h index e1674dc..ee1727f 100644 --- a/chrome/service/service_process.h +++ b/chrome/service/service_process.h @@ -12,7 +12,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/service/cloud_print/cloud_print_proxy.h" #include "chrome/service/remoting/chromoting_host_manager.h" diff --git a/chrome/service/service_process_unittest.cc b/chrome/service/service_process_unittest.cc index 7b8fff1..cfc6fc0 100644 --- a/chrome/service/service_process_unittest.cc +++ b/chrome/service/service_process_unittest.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/crypto/rsa_private_key.h" #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/service/service_process.h" #include "remoting/host/host_key_pair.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc index 1138cc4..18ddc3e 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -13,7 +13,7 @@ #include "base/threading/platform_thread.h" #include "base/process_util.h" #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 1852c49..d1dcf19 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -17,7 +17,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/automation_constants.h" #include "chrome/test/automation/automation_handle_tracker.h" diff --git a/chrome/test/live_sync/live_sessions_sync_test.h b/chrome/test/live_sync/live_sessions_sync_test.h index 03fea8c..b08ef7d4 100644 --- a/chrome/test/live_sync/live_sessions_sync_test.h +++ b/chrome/test/live_sync/live_sessions_sync_test.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/scoped_vector.h" #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index 9a3d125..1eca8aa 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -16,7 +16,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/values.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/test/signaling_task.h b/chrome/test/signaling_task.h index 23063e1..c745393 100644 --- a/chrome/test/signaling_task.h +++ b/chrome/test/signaling_task.h @@ -8,7 +8,7 @@ #define CHROME_TEST_SIGNALING_TASK_H_ #pragma once -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" using base::WaitableEvent; diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h index 6c9d52d1..5ae0a5c 100644 --- a/chrome/test/testing_browser_process.h +++ b/chrome/test/testing_browser_process.h @@ -17,7 +17,7 @@ #include "app/clipboard/clipboard.h" #include "base/string_util.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/test/thread_observer_helper.h b/chrome/test/thread_observer_helper.h index 2987437..5186b06 100644 --- a/chrome/test/thread_observer_helper.h +++ b/chrome/test/thread_observer_helper.h @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/test/thread_test_helper.h b/chrome/test/thread_test_helper.h index a1350bd6..93960e1 100644 --- a/chrome/test/thread_test_helper.h +++ b/chrome/test/thread_test_helper.h @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_thread.h" // Helper class that executes code on a given thread while blocking on the diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc index 46e716d..082f44d 100644 --- a/chrome_frame/cfproxy_test.cc +++ b/chrome_frame/cfproxy_test.cc @@ -5,7 +5,7 @@ #include <string> #include "base/file_path.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/automation_messages.h" #include "chrome_frame/cfproxy_private.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index dc17a6b..529122f 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -17,9 +17,9 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" +#include "base/synchronization/waitable_event.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" #include "chrome/app/client_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome_frame/custom_sync_call_context.h b/chrome_frame/custom_sync_call_context.h index 6162213..57a689b 100644 --- a/chrome_frame/custom_sync_call_context.h +++ b/chrome_frame/custom_sync_call_context.h @@ -1,12 +1,13 @@ // Copyright (c) 2010 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. + #ifndef CHROME_FRAME_CUSTOM_SYNC_CALL_CONTEXT_H_ #define CHROME_FRAME_CUSTOM_SYNC_CALL_CONTEXT_H_ #include <vector> #include "base/ref_counted.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome_frame/sync_msg_reply_dispatcher.h" #include "chrome_frame/chrome_frame_automation.h" #include "ipc/ipc_sync_message.h" @@ -150,5 +151,3 @@ class UnloadContext }; #endif // CHROME_FRAME_CUSTOM_SYNC_CALL_CONTEXT_H_ - - diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc index 9be4935..d7a4fe1 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -6,7 +6,7 @@ #include "base/lazy_instance.h" #include "base/tracked.h" #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome/common/automation_messages.h" #include "chrome_frame/chrome_frame_delegate.h" #include "chrome_frame/utils.h" diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index 5c503a8..8d95b83 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -7,7 +7,7 @@ #include "base/threading/thread.h" #include "base/tracked.h" -// #include "base/waitable_event.h" +// #include "base/synchronization/waitable_event.h" #include "chrome/common/automation_messages.h" #include "chrome_frame/navigation_constraints.h" diff --git a/chrome_frame/test/proxy_factory_mock.cc b/chrome_frame/test/proxy_factory_mock.cc index effc4a0..ba0b010 100644 --- a/chrome_frame/test/proxy_factory_mock.cc +++ b/chrome_frame/test/proxy_factory_mock.cc @@ -1,7 +1,7 @@ // Copyright (c) 2006-2010 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. -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "chrome_frame/test/proxy_factory_mock.h" #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index 1382cf5..fbad0f6 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/threading/thread_local.h" -#include "base/waitable_event.h" -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event.h" +#include "base/synchronization/waitable_event_watcher.h" #include "ipc/ipc_sync_message.h" using base::TimeDelta; diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h index d1cef93..7f2f7f4 100644 --- a/ipc/ipc_sync_channel.h +++ b/ipc/ipc_sync_channel.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/lock.h" #include "base/ref_counted.h" -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event_watcher.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sync_message.h" diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index b713c0a..19aa2f1 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -18,7 +18,7 @@ #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sync_message_filter.h" #include "ipc/ipc_sync_message_unittest.h" diff --git a/ipc/ipc_sync_message.cc b/ipc/ipc_sync_message.cc index 8ae65fa..21fae8f 100644 --- a/ipc/ipc_sync_message.cc +++ b/ipc/ipc_sync_message.cc @@ -11,7 +11,7 @@ #include "base/atomic_sequence_num.h" #include "base/logging.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_sync_message.h" namespace IPC { diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc index 833583c..17a4093 100644 --- a/ipc/ipc_sync_message_filter.cc +++ b/ipc/ipc_sync_message_filter.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_sync_message.h" namespace IPC { diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc index ac57d2a..b6efe96 100644 --- a/media/audio/audio_input_controller_unittest.cc +++ b/media/audio/audio_input_controller_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "media/audio/audio_input_controller.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc index d70aed1..2cf936b 100644 --- a/media/audio/audio_output_controller_unittest.cc +++ b/media/audio/audio_output_controller_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "media/audio/audio_output_controller.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index 8187b17..e5355203 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h @@ -27,7 +27,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "media/base/buffers.h" #include "media/base/filters.h" #include "media/base/media_format.h" diff --git a/media/omx/omx_unittest.cc b/media/omx/omx_unittest.cc index 8f6e69a..18dab47 100644 --- a/media/omx/omx_unittest.cc +++ b/media/omx/omx_unittest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/openmax/il/OMX_Component.h" #include "third_party/openmax/il/OMX_Core.h" diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h index 3419daa..368c783 100644 --- a/net/base/directory_lister.h +++ b/net/base/directory_lister.h @@ -8,10 +8,10 @@ #include <vector> -#include "base/cancellation_flag.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/ref_counted.h" +#include "base/synchronization/cancellation_flag.h" #include "base/task.h" #include "base/threading/platform_thread.h" diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index 887d9c1..21abd20 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -22,7 +22,7 @@ #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/threading/worker_pool.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" // We cast back and forth, so make sure it's the size we're expecting. diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 69a722e..ee60cee 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -13,7 +13,7 @@ #include "base/task.h" #include "base/threading/worker_pool.h" #include "base/threading/thread_restrictions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_NSS) diff --git a/net/base/mock_host_resolver.h b/net/base/mock_host_resolver.h index e5b8694..2972c84 100644 --- a/net/base/mock_host_resolver.h +++ b/net/base/mock_host_resolver.h @@ -8,7 +8,7 @@ #include <list> -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/host_resolver_impl.h" #include "net/base/host_resolver_proc.h" diff --git a/net/disk_cache/in_flight_io.h b/net/disk_cache/in_flight_io.h index 6c5f8ab..a361cbd 100644 --- a/net/disk_cache/in_flight_io.h +++ b/net/disk_cache/in_flight_io.h @@ -9,7 +9,7 @@ #include <set> #include "base/message_loop_proxy.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" namespace disk_cache { diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index 8f787f4..78409e5 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -9,7 +9,7 @@ #include "base/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index f333027..3005326d 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -16,7 +16,7 @@ #include "base/stringprintf.h" #include "base/task.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_common_unittest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index ba56f4d6..131c98c 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/completion_callback.h" #include "net/base/network_change_notifier.h" #include "net/base/net_log.h" diff --git a/net/proxy/sync_host_resolver_bridge.cc b/net/proxy/sync_host_resolver_bridge.cc index bcb05d6..37a847f 100644 --- a/net/proxy/sync_host_resolver_bridge.cc +++ b/net/proxy/sync_host_resolver_bridge.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/lock.h" #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/proxy/sync_host_resolver_bridge_unittest.cc b/net/proxy/sync_host_resolver_bridge_unittest.cc index 712234d..5cb053ec 100644 --- a/net/proxy/sync_host_resolver_bridge_unittest.cc +++ b/net/proxy/sync_host_resolver_bridge_unittest.cc @@ -5,7 +5,7 @@ #include "net/proxy/sync_host_resolver_bridge.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/remoting/client/chromoting_view.cc b/remoting/client/chromoting_view.cc index 5df85b67..e8b5f0f 100644 --- a/remoting/client/chromoting_view.cc +++ b/remoting/client/chromoting_view.cc @@ -5,7 +5,7 @@ #include "remoting/client/chromoting_view.h" #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "remoting/base/tracer.h" namespace remoting { diff --git a/remoting/jingle_glue/jingle_client_unittest.cc b/remoting/jingle_glue/jingle_client_unittest.cc index 08452c3..807f061 100644 --- a/remoting/jingle_glue/jingle_client_unittest.cc +++ b/remoting/jingle_glue/jingle_client_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "remoting/jingle_glue/jingle_client.h" #include "remoting/jingle_glue/jingle_thread.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/jingle_glue/jingle_thread.h b/remoting/jingle_glue/jingle_thread.h index bd60879..be64f00 100644 --- a/remoting/jingle_glue/jingle_thread.h +++ b/remoting/jingle_glue/jingle_thread.h @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/tracked_objects.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "third_party/libjingle/source/talk/base/messagequeue.h" #include "third_party/libjingle/source/talk/base/taskrunner.h" #include "third_party/libjingle/source/talk/base/thread.h" diff --git a/remoting/jingle_glue/jingle_thread_unittest.cc b/remoting/jingle_glue/jingle_thread_unittest.cc index e144727..287af05 100644 --- a/remoting/jingle_glue/jingle_thread_unittest.cc +++ b/remoting/jingle_glue/jingle_thread_unittest.cc @@ -4,7 +4,7 @@ #include "base/message_loop.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "remoting/jingle_glue/jingle_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index f7b60f7..fb5f43a 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc @@ -7,7 +7,7 @@ #include "base/nss_util.h" #include "base/path_service.h" #include "base/time.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index 870c439..0c41b00 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_error_job.h" diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc index 0535e1d..8c181d6 100644 --- a/webkit/appcache/appcache_response_unittest.cc +++ b/webkit/appcache/appcache_response_unittest.cc @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/pickle.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc index 701fdfa..2f25b65 100644 --- a/webkit/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/appcache/appcache_storage_impl_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/appcache/appcache.h" diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index b1d7016..234c967 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -6,7 +6,7 @@ #include "base/stl_util-inl.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_error_job.h" diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc index 0cbbac1..a83fd10b 100644 --- a/webkit/appcache/appcache_url_request_job_unittest.cc +++ b/webkit/appcache/appcache_url_request_job_unittest.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/pickle.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index ac1c568..1d7cd6c 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -13,7 +13,7 @@ #include "base/time.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index 7fdd72a..abb1c60 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -58,7 +58,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "gfx/rect.h" #include "gfx/size.h" #include "media/base/filters.h" diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc index 10abaaee..155a384 100644 --- a/webkit/tools/test_shell/simple_appcache_system.cc +++ b/webkit/tools/test_shell/simple_appcache_system.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/task.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "webkit/appcache/appcache_interceptor.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index ce5deea..14171a4 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -44,7 +44,7 @@ #include "base/time.h" #include "base/timer.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "net/base/cookie_store.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" |