Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4299)

Unified Diff: chrome/browser/chromeos/login/merge_session_load_page_unittest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
diff --git a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
index 8eef9c0b4ba14dab9307dbf4fb4699066085a014..5160eaffebc59307724f18337237ed9dd26c8524 100644
--- a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
+++ b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
@@ -50,11 +50,10 @@ class TestMergeSessionLoadPage : public MergeSessionLoadPage {
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(
@@ -114,12 +113,12 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageShown) {
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());

Powered by Google App Engine
This is Rietveld 408576698