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

Unified Diff: content/shell/webkit_test_controller.cc

Issue 14335017: content: Use base::MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « content/shell/shell_url_request_context_getter.cc ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_controller.cc
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc
index bf7e24ce698cce32933977f1725fd422c61472f8..ab12295414c2416a1944eb863aa1e1cadc08c9aa 100644
--- a/content/shell/webkit_test_controller.cc
+++ b/content/shell/webkit_test_controller.cc
@@ -252,7 +252,7 @@ bool WebKitTestController::PrepareForLayoutTest(
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoTimeout)) {
watchdog_.Reset(base::Bind(&WebKitTestController::TimeoutHandler,
base::Unretained(this)));
- MessageLoop::current()->PostDelayedTask(
+ base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
watchdog_.callback(),
base::TimeDelta::FromMilliseconds(kTestTimeoutMilliseconds + 1000));
@@ -424,7 +424,8 @@ void WebKitTestController::DiscardMainWindow() {
WebContentsObserver::Observe(NULL);
if (is_running_test_) {
Shell::CloseAllWindows();
- MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::MessageLoop::QuitClosure());
} else if (main_window_) {
main_window_->Close();
}
@@ -463,7 +464,7 @@ void WebKitTestController::OnTestFinished(bool did_timeout) {
printer_->PrintImageFooter();
RenderViewHost* render_view_host =
main_window_->web_contents()->GetRenderViewHost();
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(base::IgnoreResult(&WebKitTestController::Send),
base::Unretained(this),
@@ -608,11 +609,12 @@ void WebKitTestController::OnCloseRemainingWindows() {
if (open_windows[i] != main_window_)
open_windows[i]->Close();
}
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
}
void WebKitTestController::OnResetDone() {
- MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::MessageLoop::QuitClosure());
}
} // namespace content
« no previous file with comments | « content/shell/shell_url_request_context_getter.cc ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698