Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"

content/shell/browser/layout_test/layout_test_browser_main.cc

 // Copyright 2014 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 "content/shell/browser/layout_test/layout_test_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/single_thread_task_runner.h"
+#include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/browser/blink_test_controller.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "net/base/filename_util.h"
 
 #if defined(OS_ANDROID)
@@ skipping 135 matching lines @@
   bool ran_at_least_once = false;
 
   std::cout << "#READY\n";
   std::cout.flush();
 
   while (GetNextTest(args, &command_line_position, &test_string)) {
     if (!RunOneTest(test_string, &ran_at_least_once, main_runner))
       break;
   }
   if (!ran_at_least_once) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::MessageLoop::QuitClosure());
+    base::MessageLoop::current()->PostTask(FROM_HERE,
+                                           base::MessageLoop::QuitClosure());
     main_runner->Run();
   }
 
 #if defined(OS_ANDROID)
   // We need to execute 'main_runner->Shutdown()' before the test_controller
   // destructs when running on Android, and after it destructs when running
   // anywhere else.
   main_runner->Shutdown();
 #endif
 
@@ skipping 20 matching lines @@
 
   int exit_code = main_runner->Initialize(parameters);
   DCHECK_LT(exit_code, 0)
       << "BrowserMainRunner::Initialize failed in LayoutTestBrowserMain";
 
   if (exit_code >= 0)
     return exit_code;
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kCheckLayoutTestSysDeps)) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::MessageLoop::QuitClosure());
+    base::MessageLoop::current()->PostTask(FROM_HERE,
+                                           base::MessageLoop::QuitClosure());
     main_runner->Run();
     content::Shell::CloseAllWindows();
     main_runner->Shutdown();
     return 0;
   }
 
   exit_code = RunTests(main_runner);
 
 #if !defined(OS_ANDROID)
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }