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

Unified Diff: chrome/browser/prerender/prerender_browsertest.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/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index ab942b618d3ce80f2c4727a953a088c18c5c5700..9372f756eebb018b1cd5639e78136e06fe72a674 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -192,7 +192,7 @@ class ChannelDestructionWatcher {
channel_destroyed_ = true;
if (waiting_for_channel_destruction_) {
waiting_for_channel_destruction_ = false;
- MessageLoop::current()->Quit();
+ base::MessageLoop::current()->Quit();
}
}
@@ -230,7 +230,7 @@ class TestPrerenderContents : public PrerenderContents {
prerender_should_wait_for_ready_title_(
prerender_should_wait_for_ready_title) {
if (expected_number_of_loads == 0)
- MessageLoopForUI::current()->Quit();
+ base::MessageLoopForUI::current()->Quit();
}
virtual ~TestPrerenderContents() {
@@ -263,7 +263,7 @@ class TestPrerenderContents : public PrerenderContents {
if (quit_message_loop_on_destruction_) {
// The message loop may not be running if this is swapped in
// synchronously on a Navigation.
- MessageLoop* loop = MessageLoopForUI::current();
+ base::MessageLoop* loop = base::MessageLoopForUI::current();
if (loop->is_running())
loop->Quit();
}
@@ -299,7 +299,7 @@ class TestPrerenderContents : public PrerenderContents {
++number_of_loads_;
if (ShouldRenderPrerenderedPageCorrectly(expected_final_status_) &&
number_of_loads_ == expected_number_of_loads_) {
- MessageLoopForUI::current()->Quit();
+ base::MessageLoopForUI::current()->Quit();
}
}
@@ -308,7 +308,7 @@ class TestPrerenderContents : public PrerenderContents {
PrerenderContents::AddPendingPrerender(pending_prerender_info.Pass());
if (expected_pending_prerenders_ > 0 &&
pending_prerender_count() == expected_pending_prerenders_) {
- MessageLoop::current()->Quit();
+ base::MessageLoop::current()->Quit();
}
}
@@ -2405,9 +2405,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) {
// Post a task to clear the history, and run the message loop until it
// destroys the prerender.
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(&ClearBrowsingData, current_browser(),
+ base::Bind(&ClearBrowsingData,
+ current_browser(),
BrowsingDataRemover::REMOVE_HISTORY));
content::RunMessageLoop();
@@ -2424,8 +2425,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) {
// Post a task to clear the cache, and run the message loop until it
// destroys the prerender.
- MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(&ClearBrowsingData, current_browser(),
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&ClearBrowsingData,
+ current_browser(),
BrowsingDataRemover::REMOVE_CACHE));
content::RunMessageLoop();
@@ -2439,7 +2442,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) {
FINAL_STATUS_CANCELLED,
1);
// Post a task to cancel all the prerenders.
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&CancelAllPrerenders, GetPrerenderManager()));
content::RunMessageLoop();
EXPECT_TRUE(GetPrerenderContents() == NULL);
@@ -2452,7 +2455,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderEvents) {
EXPECT_TRUE(DidReceivePrerenderLoadEventForLinkNumber(0));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0));
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&CancelAllPrerenders, GetPrerenderManager()));
content::RunMessageLoop();
@@ -2469,7 +2472,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
FINAL_STATUS_CANCELLED,
1);
// Post a task to cancel all the prerenders.
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&CancelAllPrerenders, GetPrerenderManager()));
content::RunMessageLoop();
EXPECT_TRUE(GetPrerenderContents() == NULL);

Powered by Google App Engine
This is Rietveld 408576698