diff options
| -rw-r--r-- | ceee/ie/broker/broker_rpc_server.cc | 2 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/window_message_source.cc | 2 | ||||
| -rw-r--r-- | ceee/testing/utils/instance_count_mixin.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/enumerate_modules_model_win.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/com_type_info_holder.h | 2 | ||||
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.h | 2 | ||||
| -rw-r--r-- | chrome_frame/vtable_patch_manager_unittest.cc | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/ceee/ie/broker/broker_rpc_server.cc b/ceee/ie/broker/broker_rpc_server.cc index eb16d6a..63f8e7b 100644 --- a/ceee/ie/broker/broker_rpc_server.cc +++ b/ceee/ie/broker/broker_rpc_server.cc @@ -20,7 +20,7 @@ namespace { // This lock ensures that histograms created by the broker are thread safe. // The histograms created here can be initialized on multiple threads. -Lock g_metrics_lock; +base::Lock g_metrics_lock; RPC_STATUS PrepareEndpoint(std::wstring endpoint) { std::wstring protocol = kRpcProtocol; diff --git a/ceee/ie/plugin/bho/window_message_source.cc b/ceee/ie/plugin/bho/window_message_source.cc index c48ab2f..bfcf210 100644 --- a/ceee/ie/plugin/bho/window_message_source.cc +++ b/ceee/ie/plugin/bho/window_message_source.cc @@ -13,7 +13,7 @@ #include "ceee/ie/common/ceee_module_util.h" WindowMessageSource::MessageSourceMap WindowMessageSource::message_source_map_; -Lock WindowMessageSource::lock_; +base::Lock WindowMessageSource::lock_; WindowMessageSource::WindowMessageSource() : create_thread_id_(::GetCurrentThreadId()), diff --git a/ceee/testing/utils/instance_count_mixin.cc b/ceee/testing/utils/instance_count_mixin.cc index 14a0ebb..d10c881 100644 --- a/ceee/testing/utils/instance_count_mixin.cc +++ b/ceee/testing/utils/instance_count_mixin.cc @@ -14,7 +14,7 @@ testing::InstanceCountMixinBase::InstanceSet instances; namespace testing { -Lock InstanceCountMixinBase::lock_; +base::Lock InstanceCountMixinBase::lock_; InstanceCountMixinBase::InstanceCountMixinBase() { base::AutoLock lock(lock_); diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 3a23d10..f828c96 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -59,7 +59,7 @@ namespace { // Used to protect the LoadedModuleVector which is accessed // from both the UI thread and the FILE thread. -Lock* lock = NULL; +base::Lock* lock = NULL; // A struct to help de-duping modules before adding them to the enumerated // modules vector. diff --git a/chrome_frame/com_type_info_holder.h b/chrome_frame/com_type_info_holder.h index 3c974e8..bf476a5 100644 --- a/chrome_frame/com_type_info_holder.h +++ b/chrome_frame/com_type_info_holder.h @@ -83,7 +83,7 @@ class TypeInfoCache { protected: typedef std::map<const IID*, TypeInfoNameCache*> CacheMap; - Lock lock_; + base::Lock lock_; CacheMap cache_; }; diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index 2a94b25..7dfe6c2 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/chrome_frame/protocol_sink_wrap.cc @@ -85,7 +85,7 @@ END_VTABLE_PATCHES() // Static map initialization ProtData::ProtocolDataMap ProtData::datamap_; -Lock ProtData::datamap_lock_; +base::Lock ProtData::datamap_lock_; ProtocolSinkWrap::ProtocolSinkWrap() { DVLOG(1) << __FUNCTION__ << base::StringPrintf(" 0x%08X", this); diff --git a/chrome_frame/protocol_sink_wrap.h b/chrome_frame/protocol_sink_wrap.h index 0f48429..eccd6a5 100644 --- a/chrome_frame/protocol_sink_wrap.h +++ b/chrome_frame/protocol_sink_wrap.h @@ -133,7 +133,7 @@ class ProtData : public base::RefCounted<ProtData> { private: typedef std::map<IInternetProtocol*, ProtData*> ProtocolDataMap; static ProtocolDataMap datamap_; - static Lock datamap_lock_; + static base::Lock datamap_lock_; // Url we are retrieving. Used for RendererTypeForUrl() only. std::wstring url_; diff --git a/chrome_frame/vtable_patch_manager_unittest.cc b/chrome_frame/vtable_patch_manager_unittest.cc index 842a32a..82b3772 100644 --- a/chrome_frame/vtable_patch_manager_unittest.cc +++ b/chrome_frame/vtable_patch_manager_unittest.cc @@ -200,7 +200,7 @@ TEST_F(VtablePatchManagerTest, DoublePatch) { namespace vtable_patch { // Expose internal implementation detail, purely for testing. -extern Lock patch_lock_; +extern base::Lock patch_lock_; } // namespace vtable_patch |