Index: content/shell/browser/blink_test_controller.cc |
diff --git a/content/shell/browser/blink_test_controller.cc b/content/shell/browser/blink_test_controller.cc |
index ef3eeb9d8f755194f23a3f99c1507659bf47ba4f..bdfcd1de23cb898619b44e91b9ef368a66cc3ea5 100644 |
--- a/content/shell/browser/blink_test_controller.cc |
+++ b/content/shell/browser/blink_test_controller.cc |
@@ -8,10 +8,12 @@ |
#include "base/base64.h" |
#include "base/command_line.h" |
-#include "base/message_loop/message_loop.h" |
+#include "base/location.h" |
#include "base/run_loop.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/stringprintf.h" |
+#include "base/thread_task_runner_handle.h" |
#include "content/public/browser/devtools_agent_host.h" |
#include "content/public/browser/dom_storage_context.h" |
#include "content/public/browser/gpu_data_manager.h" |
@@ -400,7 +402,7 @@ void BlinkTestController::PluginCrashed(const base::FilePath& plugin_path, |
DCHECK(CalledOnValidThread()); |
printer_->AddErrorMessage( |
base::StringPrintf("#CRASHED - plugin (pid %d)", plugin_pid)); |
- base::MessageLoop::current()->PostTask( |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
base::Bind(base::IgnoreResult(&BlinkTestController::DiscardMainWindow), |
base::Unretained(this))); |
@@ -481,8 +483,8 @@ void BlinkTestController::DiscardMainWindow() { |
WebContentsObserver::Observe(NULL); |
if (test_phase_ != BETWEEN_TESTS) { |
Shell::CloseAllWindows(); |
- base::MessageLoop::current()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, base::MessageLoop::QuitClosure()); |
test_phase_ = CLEAN_UP; |
} else if (main_window_) { |
main_window_->Close(); |
@@ -515,7 +517,7 @@ void BlinkTestController::OnTestFinished() { |
RenderViewHost* render_view_host = |
main_window_->web_contents()->GetRenderViewHost(); |
main_window_->web_contents()->ExitFullscreen(); |
- base::MessageLoop::current()->PostTask( |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
base::Bind(base::IgnoreResult(&BlinkTestController::Send), |
base::Unretained(this), |
@@ -680,15 +682,15 @@ void BlinkTestController::OnResetDone() { |
return; |
} |
- base::MessageLoop::current()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, base::MessageLoop::QuitClosure()); |
} |
void BlinkTestController::OnLeakDetectionDone( |
const LeakDetectionResult& result) { |
if (!result.leaked) { |
- base::MessageLoop::current()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, base::MessageLoop::QuitClosure()); |
return; |
} |