| Index: chrome/browser/sync/profile_sync_service_harness.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
|
| index c7367cc2af99cc155fd83aac11785eff6c40d52a..264be893fe02a78d4eaa3631bee7b86128fd817b 100644
|
| --- a/chrome/browser/sync/profile_sync_service_harness.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_harness.cc
|
| @@ -292,7 +292,7 @@ void ProfileSyncServiceHarness::SignalStateCompleteWithNextState(
|
|
|
| void ProfileSyncServiceHarness::SignalStateComplete() {
|
| if (waiting_for_status_change_)
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| bool ProfileSyncServiceHarness::RunStateChangeMachine() {
|
| @@ -775,12 +775,11 @@ bool ProfileSyncServiceHarness::AwaitStatusChangeWithTimeout(
|
| // Set the flag to tell SignalStateComplete() that it's OK to quit out of
|
| // the MessageLoop if we hit a state transition.
|
| waiting_for_status_change_ = true;
|
| - MessageLoop* loop = MessageLoop::current();
|
| - MessageLoop::ScopedNestableTaskAllower allow(loop);
|
| + base::MessageLoop* loop = base::MessageLoop::current();
|
| + base::MessageLoop::ScopedNestableTaskAllower allow(loop);
|
| loop->PostDelayedTask(
|
| FROM_HERE,
|
| - base::Bind(&StateChangeTimeoutEvent::Callback,
|
| - timeout_signal.get()),
|
| + base::Bind(&StateChangeTimeoutEvent::Callback, timeout_signal.get()),
|
| base::TimeDelta::FromMilliseconds(timeout_milliseconds));
|
| loop->Run();
|
| waiting_for_status_change_ = false;
|
|
|