| Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| index e4513e9acaf13db703744e7982041f56ca38ae20..05cb6f84a274b4ffc3952e4bcdad6143e9a2e031 100644
|
| --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| @@ -135,7 +135,7 @@ void BlockLoop(base::WaitableEvent* completion, base::Callback<bool()> work) {
|
| do {
|
| completion->Wait();
|
| } while (work.Run());
|
| - MessageLoop::current()->QuitNow();
|
| + base::MessageLoop::current()->QuitNow();
|
| }
|
|
|
| ACTION_P(MockSessionManagerClientRetrievePolicyCallback, policy) {
|
| @@ -168,7 +168,7 @@ class LoginUtilsTest : public testing::Test,
|
| LoginUtilsTest()
|
| : fake_io_thread_completion_(false, false),
|
| fake_io_thread_("fake_io_thread"),
|
| - loop_(MessageLoop::TYPE_IO),
|
| + loop_(base::MessageLoop::TYPE_IO),
|
| browser_process_(TestingBrowserProcess::GetGlobal()),
|
| local_state_(browser_process_),
|
| ui_thread_(BrowserThread::UI, &loop_),
|
| @@ -195,8 +195,8 @@ class LoginUtilsTest : public testing::Test,
|
| // A thread is needed to create a new MessageLoop, since there can be only
|
| // one loop per thread.
|
| fake_io_thread_.StartWithOptions(
|
| - base::Thread::Options(MessageLoop::TYPE_IO, 0));
|
| - MessageLoop* fake_io_loop = fake_io_thread_.message_loop();
|
| + base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
|
| + base::MessageLoop* fake_io_loop = fake_io_thread_.message_loop();
|
| // Make this loop enter the single task, BlockLoop(). Pass in the completion
|
| // event and the work callback.
|
| fake_io_thread_.StopSoon();
|
| @@ -390,8 +390,7 @@ class LoginUtilsTest : public testing::Test,
|
| fake_io_thread_work_.Run();
|
| fake_io_thread_work_.Reset();
|
| BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE,
|
| - MessageLoop::QuitWhenIdleClosure());
|
| + BrowserThread::UI, FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
|
| // If there was work then keep waiting for more work.
|
| // If there was no work then quit the fake IO loop.
|
| return has_work;
|
| @@ -528,7 +527,7 @@ class LoginUtilsTest : public testing::Test,
|
| base::WaitableEvent fake_io_thread_completion_;
|
| base::Thread fake_io_thread_;
|
|
|
| - MessageLoop loop_;
|
| + base::MessageLoop loop_;
|
| TestingBrowserProcess* browser_process_;
|
| ScopedTestingLocalState local_state_;
|
|
|
|
|