Index: chrome/browser/sync/engine/syncer_thread_unittest.cc |
diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc |
index df0733ba19219343f36e1bb29951f9b411aeea85..1b02881ea2fb4d8b7206127cac268d4c83d9bc4a 100644 |
--- a/chrome/browser/sync/engine/syncer_thread_unittest.cc |
+++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc |
@@ -5,8 +5,8 @@ |
#include <list> |
#include <map> |
-#include "base/lock.h" |
#include "base/scoped_ptr.h" |
+#include "base/synchronization/lock.h" |
#include "base/time.h" |
#include "base/synchronization/waitable_event.h" |
#include "chrome/browser/sync/engine/model_safe_worker.h" |
@@ -113,7 +113,7 @@ class SyncerThreadWithSyncerTest : public testing::Test, |
void WaitForDisconnect() { |
// Wait for the SyncerThread to detect loss of connection, up to a max of |
// 10 seconds to timeout the test. |
- AutoLock lock(syncer_thread()->lock_); |
+ base::AutoLock lock(syncer_thread()->lock_); |
TimeTicks start = TimeTicks::Now(); |
TimeDelta ten_seconds = TimeDelta::FromSeconds(10); |
while (syncer_thread()->vault_.connected_) { |
@@ -127,7 +127,7 @@ class SyncerThreadWithSyncerTest : public testing::Test, |
bool Pause(ListenerMock* listener) { |
WaitableEvent event(false, false); |
{ |
- AutoLock lock(syncer_thread()->lock_); |
+ base::AutoLock lock(syncer_thread()->lock_); |
EXPECT_CALL(*listener, OnSyncEngineEvent( |
Field(&SyncEngineEvent::what_happened, |
SyncEngineEvent::SYNCER_THREAD_PAUSED))). |
@@ -141,7 +141,7 @@ class SyncerThreadWithSyncerTest : public testing::Test, |
bool Resume(ListenerMock* listener) { |
WaitableEvent event(false, false); |
{ |
- AutoLock lock(syncer_thread()->lock_); |
+ base::AutoLock lock(syncer_thread()->lock_); |
EXPECT_CALL(*listener, OnSyncEngineEvent( |
Field(&SyncEngineEvent::what_happened, |
SyncEngineEvent::SYNCER_THREAD_RESUMED))). |
@@ -318,7 +318,7 @@ TEST_F(SyncerThreadTest, CalculatePollingWaitTime) { |
scoped_refptr<SyncerThread> syncer_thread(new SyncerThread(context)); |
syncer_thread->DisableIdleDetection(); |
// Hold the lock to appease asserts in code. |
- AutoLock lock(syncer_thread->lock_); |
+ base::AutoLock lock(syncer_thread->lock_); |
// Notifications disabled should result in a polling interval of |
// kDefaultShortPollInterval. |