[chrome/chrome_watcher] Replace MessageLoopProxy usage with ThreadTaskRunnerHandle

chrome/chrome_watcher/chrome_watcher_main.cc

 // Copyright (c) 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 <windows.h>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/files/file_path.h"
 #include "base/logging_win.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/template_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/browser_watcher/endsession_watcher_window_win.h"
 #include "components/browser_watcher/exit_code_watcher_win.h"
 #include "components/browser_watcher/exit_funnel_win.h"
 #include "components/browser_watcher/window_hang_monitor_win.h"
 
@@ skipping 60 matching lines @@
 
 BrowserMonitor::BrowserMonitor(base::RunLoop* run_loop,
                                const base::char16* registry_path) :
     browser_exited_(true, false),  // manual reset, initially non-signalled.
     exit_code_watcher_(registry_path),
     end_session_watcher_window_(
         base::Bind(&BrowserMonitor::OnEndSessionMessage,
                    base::Unretained(this))),
     background_thread_("BrowserWatcherThread"),
     run_loop_(run_loop),
-    main_thread_(base::MessageLoopProxy::current()) {
+    main_thread_(base::ThreadTaskRunnerHandle::Get()) {
 }
 
 BrowserMonitor::~BrowserMonitor() {
 }
 
 bool BrowserMonitor::StartWatching(
     const base::char16* registry_path,
     base::Process process,
     base::win::ScopedHandle on_initialized_event) {
   if (!exit_code_watcher_.Initialize(process.Pass()))
@@ skipping 13 matching lines @@
           FROM_HERE, base::Bind(&BrowserMonitor::Watch, base::Unretained(this),
                                 base::Passed(on_initialized_event.Pass())))) {
     background_thread_.Stop();
     return false;
   }
 
   return true;
 }
 
 void BrowserMonitor::OnEndSessionMessage(UINT message, LPARAM lparam) {
-  DCHECK_EQ(main_thread_, base::MessageLoopProxy::current());
+  DCHECK_EQ(main_thread_, base::ThreadTaskRunnerHandle::Get());
 
   if (message == WM_QUERYENDSESSION) {
     exit_funnel_.RecordEvent(L"WatcherQueryEndSession");
   } else if (message == WM_ENDSESSION) {
     exit_funnel_.RecordEvent(L"WatcherEndSession");
   }
   if (lparam & ENDSESSION_CLOSEAPP)
     exit_funnel_.RecordEvent(L"ES_CloseApp");
   if (lparam & ENDSESSION_CRITICAL)
     exit_funnel_.RecordEvent(L"ES_Critical");
   if (lparam & ENDSESSION_LOGOFF)
     exit_funnel_.RecordEvent(L"ES_Logoff");
   const LPARAM kKnownBits =
       ENDSESSION_CLOSEAPP | ENDSESSION_CRITICAL | ENDSESSION_LOGOFF;
   if (lparam & ~kKnownBits)
     exit_funnel_.RecordEvent(L"ES_Other");
 
   // If the browser hasn't exited yet, dally for a bit to try and stretch this
   // process' lifetime to give it some more time to capture the browser exit.
   browser_exited_.TimedWait(base::TimeDelta::FromSeconds(kDelayTimeSeconds));
 
   run_loop_->Quit();
 }
 
 void BrowserMonitor::Watch(base::win::ScopedHandle on_initialized_event) {
   // This needs to run on an IO thread.
-  DCHECK_NE(main_thread_, base::MessageLoopProxy::current());
+  DCHECK_NE(main_thread_, base::ThreadTaskRunnerHandle::Get());
 
   // Signal our client now that the Kasko reporter is initialized and we have
   // cleared all of the obstacles that might lead to an early exit.
   ::SetEvent(on_initialized_event.Get());
   on_initialized_event.Close();
 
   exit_code_watcher_.WaitForExit();
   exit_funnel_.RecordEvent(L"BrowserExit");
 
   // Note that the browser has exited.
   browser_exited_.Signal();
 
   main_thread_->PostTask(FROM_HERE,
       base::Bind(&BrowserMonitor::BrowserExited, base::Unretained(this)));
 }
 
 void BrowserMonitor::BrowserExited() {
   // This runs in the main thread.
-  DCHECK_EQ(main_thread_, base::MessageLoopProxy::current());
+  DCHECK_EQ(main_thread_, base::ThreadTaskRunnerHandle::Get());
 
   // Our background thread has served it's purpose.
   background_thread_.Stop();
 
   const int exit_code = exit_code_watcher_.exit_code();
   if (exit_code >= 0 && exit_code <= 28) {
     // The browser exited with a well-known exit code, quit this process
     // immediately.
     run_loop_->Quit();
   } else {
@@ skipping 152 matching lines @@
 
   // Wind logging down.
   logging::LogEventProvider::Uninitialize();
 
   return 0;
 }
 
 static_assert(
     base::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value,
     "WatcherMain() has wrong type");