Index: chrome/browser/sync/engine/syncapi.cc |
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc |
index 24487eb86a8ff58941eb8eb57ef3228af8bcb595..b6f833940fcd0ad7f53f586bdf378ec0c35a3b2e 100644 |
--- a/chrome/browser/sync/engine/syncapi.cc |
+++ b/chrome/browser/sync/engine/syncapi.cc |
@@ -11,12 +11,12 @@ |
#include <vector> |
#include "base/base64.h" |
-#include "base/lock.h" |
#include "base/logging.h" |
#include "base/message_loop.h" |
#include "base/scoped_ptr.h" |
#include "base/sha1.h" |
#include "base/string_util.h" |
+#include "base/synchronization/lock.h" |
#include "base/task.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/browser_thread.h" |
@@ -1079,7 +1079,7 @@ class SyncManager::SyncInternal |
// Whether we're initialized to the point of being able to accept changes |
// (and hence allow transaction creation). See initialized_ for details. |
bool initialized() const { |
- AutoLock lock(initialized_mutex_); |
+ base::AutoLock lock(initialized_mutex_); |
return initialized_; |
} |
@@ -1319,7 +1319,7 @@ class SyncManager::SyncInternal |
// meaning we are ready to accept changes. Protected by initialized_mutex_ |
// as it can get read/set by both the SyncerThread and the AuthWatcherThread. |
bool initialized_; |
- mutable Lock initialized_mutex_; |
+ mutable base::Lock initialized_mutex_; |
notifier::NotifierOptions notifier_options_; |
@@ -1540,7 +1540,7 @@ void SyncManager::SyncInternal::MarkAndNotifyInitializationComplete() { |
// between their respective threads to call MarkAndNotify. We need to make |
// sure the observer is notified once and only once. |
{ |
- AutoLock lock(initialized_mutex_); |
+ base::AutoLock lock(initialized_mutex_); |
if (initialized_) |
return; |
initialized_ = true; |