6 files changed, 18 insertions, 18 deletions
diff --git a/ceee/ie/plugin/bho/cookie_accountant.cc b/ceee/ie/plugin/bho/cookie_accountant.cc
index 1445b97..ad326c9 100644
--- a/ceee/ie/plugin/bho/cookie_accountant.cc
+++ b/ceee/ie/plugin/bho/cookie_accountant.cc
@@ -235,7 +235,7 @@ void CookieAccountant::ConnectBroker() {
 
 void CookieAccountant::Initialize() {
   {
-    AutoLock lock(lock_);
+    base::AutoLock lock(lock_);
     if (initializing_)
       return;
     initializing_ = true;
@@ -257,7 +257,7 @@ void CookieAccountant::Initialize() {
   DCHECK(internet_set_cookie_ex_a_patch_.is_patched() ||
          internet_set_cookie_ex_w_patch_.is_patched());
   {
-    AutoLock lock(lock_);
+    base::AutoLock lock(lock_);
     initializing_ = false;
   }
 }
diff --git a/ceee/ie/plugin/bho/cookie_accountant.h b/ceee/ie/plugin/bho/cookie_accountant.h
index 23111de..05bef8b 100644
--- a/ceee/ie/plugin/bho/cookie_accountant.h
+++ b/ceee/ie/plugin/bho/cookie_accountant.h
@@ -13,8 +13,8 @@
 #include <string>
 
 #include "app/win/iat_patch_function.h"
-#include "base/lock.h"
 #include "base/singleton.h"
+#include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "ceee/ie/plugin/bho/cookie_events_funnel.h"
 #include "net/base/cookie_monster.h"
@@ -86,7 +86,7 @@ class CookieAccountant {
   bool initializing_;
 
   // A lock that protects access to the function patches.
-  Lock lock_;
+  base::Lock lock_;
 
   // Cached singleton instance. Useful for unit testing.
   static CookieAccountant* singleton_instance_;
diff --git a/ceee/ie/plugin/bho/window_message_source.cc b/ceee/ie/plugin/bho/window_message_source.cc
index cd462d8..c48ab2f 100644
--- a/ceee/ie/plugin/bho/window_message_source.cc
+++ b/ceee/ie/plugin/bho/window_message_source.cc
@@ -196,7 +196,7 @@ bool WindowMessageSource::AddEntryToMap(DWORD thread_id,
                                         WindowMessageSource* source) {
   DCHECK(source != NULL);
 
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   MessageSourceMap::const_iterator iter = message_source_map_.find(thread_id);
   if (iter != message_source_map_.end())
     return false;
@@ -208,13 +208,13 @@ bool WindowMessageSource::AddEntryToMap(DWORD thread_id,
 
 // static
 WindowMessageSource* WindowMessageSource::GetEntryFromMap(DWORD thread_id) {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   MessageSourceMap::const_iterator iter = message_source_map_.find(thread_id);
   return iter == message_source_map_.end() ? NULL : iter->second;
 }
 
 // static
 void WindowMessageSource::RemoveEntryFromMap(DWORD thread_id) {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   message_source_map_.erase(thread_id);
 }
diff --git a/ceee/ie/plugin/bho/window_message_source.h b/ceee/ie/plugin/bho/window_message_source.h
index baceafa..bec48089 100644
--- a/ceee/ie/plugin/bho/window_message_source.h
+++ b/ceee/ie/plugin/bho/window_message_source.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 
 // A WindowMessageSource instance monitors keyboard and mouse messages on the
 // same thread as the one that creates the instance, and fires events to those
@@ -95,7 +95,7 @@ class WindowMessageSource {
   static MessageSourceMap message_source_map_;
 
   // Used to protect access to the message_source_map_.
-  static Lock lock_;
+  static base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowMessageSource);
 };
diff --git a/ceee/ie/plugin/scripting/script_host.cc b/ceee/ie/plugin/scripting/script_host.cc
index 15a57eb..d1e74ef 100644
--- a/ceee/ie/plugin/scripting/script_host.cc
+++ b/ceee/ie/plugin/scripting/script_host.cc
@@ -705,7 +705,7 @@ void ScriptHost::DebugApplication::RegisterDebugApplication() {
 }
 
 void ScriptHost::DebugApplication::Initialize() {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
 
   ++initialization_count_;
 
@@ -715,7 +715,7 @@ void ScriptHost::DebugApplication::Initialize() {
 
 void ScriptHost::DebugApplication::Initialize(
     IUnknown* debug_application_provider) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
 
   ++initialization_count_;
 
@@ -742,7 +742,7 @@ void ScriptHost::DebugApplication::Initialize(
 
 void ScriptHost::DebugApplication::Initialize(
     IProcessDebugManager* manager, IDebugApplication* app) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   // This function is exposed for testing only.
   DCHECK_EQ(0U, initialization_count_);
 
@@ -758,7 +758,7 @@ void ScriptHost::DebugApplication::Initialize(
 
 
 void ScriptHost::DebugApplication::Terminate() {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   DCHECK_GT(initialization_count_, (size_t)0);
   --initialization_count_;
 
@@ -778,7 +778,7 @@ void ScriptHost::DebugApplication::Terminate() {
 
 HRESULT ScriptHost::DebugApplication::GetDebugApplication(
     IDebugApplication** app) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
 
   if (debug_application_ == NULL)
     return E_NOTIMPL;
@@ -788,7 +788,7 @@ HRESULT ScriptHost::DebugApplication::GetDebugApplication(
 
 HRESULT ScriptHost::DebugApplication::GetRootApplicationNode(
     IDebugApplicationNode** debug_app_node) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
 
   if (debug_application_ == NULL) {
     *debug_app_node = NULL;
@@ -801,7 +801,7 @@ HRESULT ScriptHost::DebugApplication::GetRootApplicationNode(
 HRESULT ScriptHost::DebugApplication::CreateDebugDocumentHelper(
     const wchar_t* long_name, const wchar_t* code, TEXT_DOC_ATTR attributes,
     IDebugDocumentHelper** helper) {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
 
   if (debug_application_ == NULL)
     return S_OK;
diff --git a/ceee/ie/plugin/scripting/script_host.h b/ceee/ie/plugin/scripting/script_host.h
index 553d142..5fe64e1 100644
--- a/ceee/ie/plugin/scripting/script_host.h
+++ b/ceee/ie/plugin/scripting/script_host.h
@@ -19,8 +19,8 @@
 #include <map>
 #include <string>
 
-#include "base/lock.h"
 #include "base/logging.h"
+#include "base/synchronization/lock.h"
 #include "third_party/activscp/activdbg.h"
 #include "ceee/common/initializing_coclass.h"
 
@@ -293,7 +293,7 @@ class ScriptHost::DebugApplication {
   void RegisterDebugApplication();  // Under lock_.
 
   // Protects all members below.
-  ::Lock lock_;  // Our containing class has a Lock method.
+  base::Lock lock_;
 
   // Number of initialization calls.
   size_t initialization_count_;