chrome: Use base::MessageLoop. (Part 3)

chrome/browser/chromeos/login/merge_session_load_page_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/merge_session_load_page.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 32 matching lines @@
 
  private:
   MergeSessionLoadPageTest* test_page_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMergeSessionLoadPage);
 };
 
 class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
  public:
   MergeSessionLoadPageTest()
-      : ui_thread_(BrowserThread::UI, MessageLoop::current()),
-        file_user_blocking_thread_(
-            BrowserThread::FILE_USER_BLOCKING, MessageLoop::current()),
-        io_thread_(BrowserThread::IO, MessageLoop::current()) {
-  }
+      : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
+        file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING,
+                                   base::MessageLoop::current()),
+        io_thread_(BrowserThread::IO, base::MessageLoop::current()) {}
 
   void Navigate(const char* url, int page_id) {
     WebContentsTester::For(web_contents())->TestDidNavigate(
         web_contents()->GetRenderViewHost(), page_id, GURL(url),
         content::PAGE_TRANSITION_TYPED);
   }
 
   void ShowInterstitial(const char* url) {
     (new TestMergeSessionLoadPage(web_contents(), GURL(url), this))->Show();
   }
@@ skipping 39 matching lines @@
   Navigate(kURL1, 1);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        content::PAGE_TRANSITION_TYPED, std::string());
 
   // Simulate the load causing an merge session interstitial page
   // to be shown.
   ShowInterstitial(kURL2);
   InterstitialPage* interstitial = GetMergeSessionLoadPage();
   ASSERT_TRUE(interstitial);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // Simulate merge session completion.
   UserManager::Get()->SetMergeSessionState(
       UserManager::MERGE_STATUS_DONE);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // The URL remains to be URL2.
   EXPECT_EQ(kURL2, web_contents()->GetURL().spec());
 
   // Commit navigation and the interstitial page is gone.
   Navigate(kURL2, 2);
   EXPECT_FALSE(GetMergeSessionLoadPage());
 }
 
 }  // namespace chromeos