chromeos: Remove use of MessageLoopProxy and deprecated MessageLoop APIs

This patch was mostly autogenerated with https://codereview.chromium.org/1010073002/.

BUG=465354

Review URL: https://codereview.chromium.org/1173593002

Cr-Commit-Position: refs/heads/master@{#333996}

chromeos/accelerometer/accelerometer_reader.cc

@@ -10,12 +10,13 @@
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/memory/singleton.h"
-#include "base/message_loop/message_loop.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 
 namespace chromeos {
@@ -265,10 +266,9 @@ void AccelerometerReader::OnDataRead(
   }
 
   // Trigger another read after the current sampling delay.
-  base::MessageLoop::current()->PostDelayedTask(
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
-      base::Bind(&AccelerometerReader::TriggerRead,
-                 weak_factory_.GetWeakPtr()),
+      base::Bind(&AccelerometerReader::TriggerRead, weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kDelayBetweenReadsMs));
 }
 

chromeos/cert_loader.cc

@@ -8,7 +8,6 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"

chromeos/cryptohome/async_method_caller.cc

@@ -7,7 +7,8 @@
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/location.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 using chromeos::DBusThreadManager;
@@ -252,21 +253,19 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
     CallbackElement() {}
     explicit CallbackElement(const AsyncMethodCaller::Callback& callback)
         : callback(callback),
-          proxy(base::MessageLoopProxy::current()) {
-    }
+          task_runner(base::ThreadTaskRunnerHandle::Get()) {}
     AsyncMethodCaller::Callback callback;
-    scoped_refptr<base::MessageLoopProxy> proxy;
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner;
   };
 
   struct DataCallbackElement {
     DataCallbackElement() {}
     explicit DataCallbackElement(
         const AsyncMethodCaller::DataCallback& callback)
         : data_callback(callback),
-          proxy(base::MessageLoopProxy::current()) {
-    }
+          task_runner(base::ThreadTaskRunnerHandle::Get()) {}
     AsyncMethodCaller::DataCallback data_callback;
-    scoped_refptr<base::MessageLoopProxy> proxy;
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner;
   };
 
   typedef base::hash_map<int, CallbackElement> CallbackMap;
@@ -287,10 +286,9 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       LOG(ERROR) << "Received signal for unknown async_id " << async_id;
       return;
     }
-    it->second.proxy->PostTask(FROM_HERE,
-        base::Bind(it->second.callback,
-                   return_status,
-                   static_cast<MountError>(return_code)));
+    it->second.task_runner->PostTask(
+        FROM_HERE, base::Bind(it->second.callback, return_status,
+                              static_cast<MountError>(return_code)));
     callback_map_.erase(it);
   }
 
@@ -303,15 +301,16 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       LOG(ERROR) << "Received signal for unknown async_id " << async_id;
       return;
     }
-    it->second.proxy->PostTask(FROM_HERE,
+    it->second.task_runner->PostTask(
+        FROM_HERE,
         base::Bind(it->second.data_callback, return_status, return_data));
     data_callback_map_.erase(it);
   }
   // Registers a callback which is called when the result for AsyncXXX is ready.
   void RegisterAsyncCallback(
       Callback callback, const char* error, int async_id) {
     if (async_id == chromeos::CryptohomeClient::kNotReadyAsyncId) {
-      base::MessageLoopProxy::current()->PostTask(
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(callback,
                                 false,  // return status
                                 cryptohome::MOUNT_ERROR_FATAL));
@@ -332,7 +331,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   void RegisterAsyncDataCallback(
       DataCallback callback, const char* error, int async_id) {
     if (async_id == chromeos::CryptohomeClient::kNotReadyAsyncId) {
-      base::MessageLoopProxy::current()->PostTask(
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(callback,
                                 false,  // return status
                                 std::string()));

chromeos/cryptohome/system_salt_getter.cc

@@ -6,9 +6,10 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
@@ -28,7 +29,7 @@ SystemSaltGetter::~SystemSaltGetter() {
 void SystemSaltGetter::GetSystemSalt(
     const GetSystemSaltCallback& callback) {
   if (!system_salt_.empty()) {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, system_salt_));
     return;
   }

chromeos/dbus/ap_manager_client.cc

@@ -5,10 +5,12 @@
 #include "chromeos/dbus/ap_manager_client.h"
 
 #include "base/bind.h"
+#include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop.h"
 #include "base/observer_list.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_manager.h"
@@ -146,7 +148,7 @@ void ApManagerClientImpl::CreateService(
   dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(
       dbus::ObjectPath(apmanager::kApManagerManagerPath));
   if (!object_proxy) {
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ApManagerClientImpl::OnObjectPathDBusMethod,
                    weak_ptr_factory_.GetWeakPtr(), callback, nullptr));
@@ -168,7 +170,7 @@ void ApManagerClientImpl::RemoveService(
   dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(
       dbus::ObjectPath(apmanager::kApManagerManagerPath));
   if (!object_proxy) {
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ApManagerClientImpl::OnVoidDBusMethod,
                    weak_ptr_factory_.GetWeakPtr(), callback, nullptr));
@@ -190,7 +192,7 @@ void ApManagerClientImpl::StartService(const dbus::ObjectPath& object_path,
   dbus::ObjectProxy* object_proxy =
       object_manager_->GetObjectProxy(object_path);
   if (!object_proxy) {
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ApManagerClientImpl::OnVoidDBusMethod,
                    weak_ptr_factory_.GetWeakPtr(), callback, nullptr));
@@ -211,7 +213,7 @@ void ApManagerClientImpl::StopService(const dbus::ObjectPath& object_path,
   dbus::ObjectProxy* object_proxy =
       object_manager_->GetObjectProxy(object_path);
   if (!object_proxy) {
-    base::MessageLoop::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ApManagerClientImpl::OnVoidDBusMethod,
                    weak_ptr_factory_.GetWeakPtr(), callback, nullptr));

chromeos/dbus/cros_disks_client.cc

@@ -10,7 +10,6 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"

chromeos/dbus/dbus_thread_manager.cc

@@ -79,7 +79,7 @@ DBusThreadManager::DBusThreadManager(scoped_ptr<DBusClientBundle> client_bundle)
     dbus::Bus::Options system_bus_options;
     system_bus_options.bus_type = dbus::Bus::SYSTEM;
     system_bus_options.connection_type = dbus::Bus::PRIVATE;
-    system_bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+    system_bus_options.dbus_task_runner = dbus_thread_->task_runner();
     system_bus_ = new dbus::Bus(system_bus_options);
   }
 }

chromeos/dbus/fake_amplifier_client.cc

@@ -5,7 +5,9 @@
 #include "chromeos/dbus/fake_amplifier_client.h"
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
+#include "base/location.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 
 namespace chromeos {
 
@@ -37,20 +39,20 @@ void FakeAmplifierClient::RemoveObserver(Observer* observer) {
 }
 
 void FakeAmplifierClient::Initialize(const BoolDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnBoolDBusMethod, callback));
 }
 
 void FakeAmplifierClient::SetStandbyMode(
     bool standby,
     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAmplifierClient::SetVolume(double db_spl,
                                     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 

chromeos/dbus/fake_ap_manager_client.cc

@@ -4,7 +4,8 @@
 
 #include "chromeos/dbus/fake_ap_manager_client.h"
 
-#include "base/message_loop/message_loop.h"
+#include "base/location.h"
+#include "base/thread_task_runner_handle.h"
 
 namespace chromeos {
 
@@ -36,26 +37,26 @@ void FakeApManagerClient::RemoveObserver(Observer* observer) {
 
 void FakeApManagerClient::CreateService(
     const ObjectPathDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&ObjectPathDBBusMethodCallbackThunk, callback));
 }
 
 void FakeApManagerClient::RemoveService(
     const dbus::ObjectPath& object_path,
     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&VoidDBBusMethodCallbackThunk, callback));
 }
 
 void FakeApManagerClient::StartService(const dbus::ObjectPath& object_path,
                                        const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&VoidDBBusMethodCallbackThunk, callback));
 }
 
 void FakeApManagerClient::StopService(const dbus::ObjectPath& object_path,
                                       const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&VoidDBBusMethodCallbackThunk, callback));
 }
 

chromeos/dbus/fake_audio_dsp_client.cc

@@ -5,7 +5,9 @@
 #include "chromeos/dbus/fake_audio_dsp_client.h"
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
+#include "base/location.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 
 namespace chromeos {
 
@@ -53,53 +55,53 @@ void FakeAudioDspClient::RemoveObserver(Observer* observer) {
 }
 
 void FakeAudioDspClient::Initialize(const BoolDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnBoolDBusMethod, callback));
 }
 
 void FakeAudioDspClient::SetStandbyMode(
     bool standby,
     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::SetNightMode(bool standby,
                                       const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::GetNightMode(const BoolDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnBoolDBusMethod, callback));
 }
 
 void FakeAudioDspClient::SetTreble(double db_fs,
                                    const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::GetTreble(const DoubleDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnDoubleDBusMethod, callback));
 }
 
 void FakeAudioDspClient::SetBass(double db_fs,
                                  const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::GetBass(const DoubleDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnDoubleDBusMethod, callback));
 }
 
 void FakeAudioDspClient::GetCapabilitiesOEM(
     const ThreeStringDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnThreeStringDBusMethod, callback));
 }
 
@@ -108,35 +110,35 @@ void FakeAudioDspClient::SetCapabilitiesOEM(
     const std::string& speaker_capabilities,
     const std::string& driver_capabilities,
     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::GetFilterConfigOEM(
     uint32 speaker_id,
     const TwoStringDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnTwoStringDBusMethod, callback));
 }
 
 void FakeAudioDspClient::SetFilterConfigOEM(
     const std::string& speaker_config,
     const std::string& driver_config,
     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::SetSourceType(uint16 source_type,
                                        const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }
 
 void FakeAudioDspClient::AmplifierVolumeChanged(
     double db_spl,
     const VoidDBusMethodCallback& callback) {
-  base::MessageLoop::current()->PostTask(
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OnVoidDBusMethod, callback));
 }