chromeos: Use base::MessageLoop.

BUG=236029
R=oshima@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202997 0039d316-1c4b-4281-b951-d872f2087c98

40 files changed, 172 insertions, 172 deletions

diff --git a/chromeos/attestation/attestation_flow_unittest.cc b/chromeos/attestation/attestation_flow_unittest.cc
index 9f70434..ea819b0 100644
--- a/chromeos/attestation/attestation_flow_unittest.cc
+++ b/chromeos/attestation/attestation_flow_unittest.cc
@@ -23,17 +23,17 @@ namespace attestation {
 namespace {
 
 void DBusCallbackFalse(const BoolDBusMethodCallback& callback) {
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, false));
 }
 
 void DBusCallbackTrue(const BoolDBusMethodCallback& callback) {
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
 }
 
 void DBusCallbackFail(const BoolDBusMethodCallback& callback) {
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_FAILURE, false));
 }
 
@@ -46,7 +46,7 @@ class FakeDBusData {
   explicit FakeDBusData(const std::string& data) : data_(data) {}
 
   void operator() (const CryptohomeClient::DataMethodCallback& callback) {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true, data_));
   }
@@ -63,7 +63,7 @@ class AttestationFlowTest : public testing::Test {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 };
 
 TEST_F(AttestationFlowTest, GetCertificate) {
diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc
index c05ff7c..f420463 100644
--- a/chromeos/dbus/cryptohome_client.cc
+++ b/chromeos/dbus/cryptohome_client.cc
@@ -813,7 +813,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
 
   // CryptohomeClient override.
   virtual void IsMounted(const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -859,7 +859,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
     // Even for stub implementation we have to return different values
     // so that multi-profiles would work.
     std::string sanitized_username = GetStubSanitizedUsername(username);
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, sanitized_username));
   }
@@ -879,13 +879,13 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
 
   // CryptohomeClient override.
   virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
   // CryptohomeClient override.
   virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -899,14 +899,14 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   virtual void TpmGetPassword(
       const StringDBusMethodCallback& callback) OVERRIDE {
     const char kStubTpmPassword[] = "Stub-TPM-password";
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, kStubTpmPassword));
   }
 
   // CryptohomeClient override.
   virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -919,7 +919,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   // CryptohomeClient override.
   virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback)
       OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -932,14 +932,14 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   // CryptohomeClient override.
   virtual void TpmCanAttemptOwnership(
       const VoidDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
   }
 
   // CryptohomeClient override.
   virtual void TpmClearStoredPassword(const VoidDBusMethodCallback& callback)
       OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
   }
 
@@ -949,7 +949,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   // CryptohomeClient override.
   virtual void Pkcs11IsTpmTokenReady(
       const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -958,7 +958,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
       const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE {
     const char kStubLabel[] = "Stub TPM Token";
     const char kStubUserPin[] = "012345";
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, kStubLabel,
                               kStubUserPin));
   }
@@ -996,7 +996,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   // CryptohomeClient override.
   virtual void InstallAttributesIsReady(const BoolDBusMethodCallback& callback)
       OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -1016,14 +1016,14 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   // CryptohomeClient override.
   virtual void TpmAttestationIsPrepared(
         const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
   // CryptohomeClient override.
   virtual void TpmAttestationIsEnrolled(
         const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
@@ -1061,7 +1061,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
       attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, false));
   }
@@ -1071,7 +1071,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
       attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, false, std::string()));
   }
@@ -1081,7 +1081,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
       attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, false, std::string()));
   }
@@ -1119,7 +1119,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
       attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, false, std::string()));
   }
@@ -1129,7 +1129,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
       const std::string& key_name,
       const std::string& payload,
       const BoolDBusMethodCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, false));
   }
@@ -1139,7 +1139,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   // Posts tasks which return fake results to the UI thread.
   void ReturnAsyncMethodResult(const AsyncMethodCallback& callback,
                                bool returns_data) {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&CryptohomeClientStubImpl::ReturnAsyncMethodResultInternal,
                    weak_ptr_factory_.GetWeakPtr(),
@@ -1152,14 +1152,14 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
                                        bool returns_data) {
     callback.Run(async_call_id_);
     if (!returns_data && !async_call_status_handler_.is_null()) {
-      MessageLoop::current()->PostTask(
+      base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(async_call_status_handler_,
                      async_call_id_,
                      true,
                      cryptohome::MOUNT_ERROR_NONE));
     } else if (returns_data && !async_call_status_data_handler_.is_null()) {
-      MessageLoop::current()->PostTask(
+      base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(async_call_status_data_handler_,
                      async_call_id_,
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index ed6e2c8..e7605eb 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -67,7 +67,7 @@ class DBusThreadManagerImpl : public DBusThreadManager {
 
     // Create the D-Bus thread.
     base::Thread::Options thread_options;
-    thread_options.message_loop_type = MessageLoop::TYPE_IO;
+    thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
     dbus_thread_.reset(new base::Thread("D-Bus thread"));
     dbus_thread_->StartWithOptions(thread_options);
 
diff --git a/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc
index 0d6f62d..21841e4 100644
--- a/chromeos/dbus/debug_daemon_client.cc
+++ b/chromeos/dbus/debug_daemon_client.cc
@@ -575,45 +575,46 @@ class DebugDaemonClientStubImpl : public DebugDaemonClient {
   virtual void GetRoutes(bool numeric, bool ipv6,
                          const GetRoutesCallback& callback) OVERRIDE {
     std::vector<std::string> empty;
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, false, empty));
   }
   virtual void GetNetworkStatus(const GetNetworkStatusCallback& callback)
       OVERRIDE {
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, false, ""));
   }
   virtual void GetModemStatus(const GetModemStatusCallback& callback)
       OVERRIDE {
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, false, ""));
   }
   virtual void GetNetworkInterfaces(
       const GetNetworkInterfacesCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, false, ""));
   }
   virtual void GetPerfData(uint32_t duration,
                            const GetPerfDataCallback& callback) OVERRIDE {
     std::vector<uint8> data;
-    MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, data));
+    base::MessageLoop::current()->PostTask(FROM_HERE,
+                                           base::Bind(callback, data));
   }
   virtual void GetAllLogs(const GetLogsCallback& callback) OVERRIDE {
     std::map<std::string, std::string> empty;
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, false, empty));
   }
   virtual void GetUserLogFiles(const GetLogsCallback& callback) OVERRIDE {
     std::map<std::string, std::string> user_logs;
     user_logs["preferences"] = "Preferences";
     user_logs["invalid_file"] = "Invalid File";
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, true, user_logs));
   }
 
   virtual void TestICMP(const std::string& ip_address,
                         const TestICMPCallback& callback) OVERRIDE {
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, false, ""));
   }
 };
diff --git a/chromeos/dbus/fake_bluetooth_device_client.cc b/chromeos/dbus/fake_bluetooth_device_client.cc
index b1ed840..60fd5e4 100644
--- a/chromeos/dbus/fake_bluetooth_device_client.cc
+++ b/chromeos/dbus/fake_bluetooth_device_client.cc
@@ -418,7 +418,7 @@ void FakeBluetoothDeviceClient::Pair(
       object_path == dbus::ObjectPath(kUnconnectableDevicePath)) {
     // No need to call anything on the pairing delegate, just wait 3 times
     // the interval before acting as if the other end accepted it.
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
                    base::Unretained(this),
@@ -430,7 +430,7 @@ void FakeBluetoothDeviceClient::Pair(
     // if the other end accepted it.
     agent_service_provider->DisplayPinCode(object_path, "123456");
 
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
                    base::Unretained(this),
@@ -439,7 +439,7 @@ void FakeBluetoothDeviceClient::Pair(
 
   } else if (object_path == dbus::ObjectPath(kVanishingDevicePath)) {
     // The vanishing device simulates being too far away, and thus times out.
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::TimeoutSimulatedPairing,
                    base::Unretained(this),
@@ -451,7 +451,7 @@ void FakeBluetoothDeviceClient::Pair(
     // for it.
     agent_service_provider->DisplayPasskey(object_path, 123456, 0);
 
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::SimulateKeypress,
                    base::Unretained(this),
@@ -490,7 +490,7 @@ void FakeBluetoothDeviceClient::Pair(
 
   } else if (object_path == dbus::ObjectPath(kUnpairableDevicePath)) {
     // Fails the pairing with an org.bluez.Error.Failed error.
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::FailSimulatedPairing,
                    base::Unretained(this),
@@ -518,7 +518,7 @@ void FakeBluetoothDeviceClient::BeginDiscoverySimulation(
 
   discovery_simulation_step_ = 1;
 
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&FakeBluetoothDeviceClient::DiscoverySimulationTimer,
                  base::Unretained(this)),
@@ -808,7 +808,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
   }
 
   ++discovery_simulation_step_;
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&FakeBluetoothDeviceClient::DiscoverySimulationTimer,
                  base::Unretained(this)),
@@ -893,7 +893,7 @@ void FakeBluetoothDeviceClient::PinCodeCallback(
   VLOG(1) << "PinCodeCallback: " << object_path.value();
 
   if (status == ExperimentalBluetoothAgentServiceProvider::Delegate::SUCCESS) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
                    base::Unretained(this),
@@ -902,7 +902,7 @@ void FakeBluetoothDeviceClient::PinCodeCallback(
 
   } else if (status ==
              ExperimentalBluetoothAgentServiceProvider::Delegate::CANCELLED) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CancelSimulatedPairing,
                    base::Unretained(this),
@@ -911,7 +911,7 @@ void FakeBluetoothDeviceClient::PinCodeCallback(
 
   } else if (status ==
              ExperimentalBluetoothAgentServiceProvider::Delegate::REJECTED) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::RejectSimulatedPairing,
                    base::Unretained(this),
@@ -930,7 +930,7 @@ void FakeBluetoothDeviceClient::PasskeyCallback(
   VLOG(1) << "PasskeyCallback: " << object_path.value();
 
   if (status == ExperimentalBluetoothAgentServiceProvider::Delegate::SUCCESS) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
                    base::Unretained(this),
@@ -939,7 +939,7 @@ void FakeBluetoothDeviceClient::PasskeyCallback(
 
   } else if (status ==
              ExperimentalBluetoothAgentServiceProvider::Delegate::CANCELLED) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CancelSimulatedPairing,
                    base::Unretained(this),
@@ -948,7 +948,7 @@ void FakeBluetoothDeviceClient::PasskeyCallback(
 
   } else if (status ==
              ExperimentalBluetoothAgentServiceProvider::Delegate::REJECTED) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::RejectSimulatedPairing,
                    base::Unretained(this),
@@ -966,7 +966,7 @@ void FakeBluetoothDeviceClient::ConfirmationCallback(
   VLOG(1) << "ConfirmationCallback: " << object_path.value();
 
   if (status == ExperimentalBluetoothAgentServiceProvider::Delegate::SUCCESS) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
                    base::Unretained(this),
@@ -975,7 +975,7 @@ void FakeBluetoothDeviceClient::ConfirmationCallback(
 
   } else if (status ==
              ExperimentalBluetoothAgentServiceProvider::Delegate::CANCELLED) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CancelSimulatedPairing,
                    base::Unretained(this),
@@ -984,7 +984,7 @@ void FakeBluetoothDeviceClient::ConfirmationCallback(
 
   } else if (status ==
              ExperimentalBluetoothAgentServiceProvider::Delegate::REJECTED) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::RejectSimulatedPairing,
                    base::Unretained(this),
@@ -1010,7 +1010,7 @@ void FakeBluetoothDeviceClient::SimulateKeypress(
   agent_service_provider->DisplayPasskey(object_path, 123456, entered);
 
   if (entered < 7) {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::SimulateKeypress,
                    base::Unretained(this),
@@ -1018,7 +1018,7 @@ void FakeBluetoothDeviceClient::SimulateKeypress(
         base::TimeDelta::FromMilliseconds(simulation_interval_ms_));
 
   } else {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
                    base::Unretained(this),
diff --git a/chromeos/dbus/fake_cryptohome_client.cc b/chromeos/dbus/fake_cryptohome_client.cc
index 16f9a1c..f019de0 100644
--- a/chromeos/dbus/fake_cryptohome_client.cc
+++ b/chromeos/dbus/fake_cryptohome_client.cc
@@ -71,7 +71,7 @@ void FakeCryptohomeClient::AsyncMigrateKey(
 }
 
 void FakeCryptohomeClient::IsMounted(const BoolDBusMethodCallback& callback) {
-  MessageLoop::current()->PostTask(FROM_HERE,
+  base::MessageLoop::current()->PostTask(FROM_HERE,
                                    base::Bind(callback,
                                               DBUS_METHOD_CALL_SUCCESS, true));
 }
@@ -87,10 +87,10 @@ void FakeCryptohomeClient::AsyncMount(const std::string& username,
                                       const AsyncMethodCallback& callback) {
   DCHECK(!callback.is_null());
 
-  MessageLoop::current()->PostTask(FROM_HERE,
+  base::MessageLoop::current()->PostTask(FROM_HERE,
                                    base::Bind(callback, 1 /* async_id */));
   if (!handler_.is_null())
-    MessageLoop::current()->PostTask(FROM_HERE,
+    base::MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(handler_,
                                                 1,     // async_id
                                                 true,  // return_status
@@ -162,7 +162,7 @@ void FakeCryptohomeClient::TpmAttestationGetCertificate(
 
 void FakeCryptohomeClient::InstallAttributesIsReady(
     const BoolDBusMethodCallback& callback) {
-  MessageLoop::current()->PostTask(FROM_HERE,
+  base::MessageLoop::current()->PostTask(FROM_HERE,
                                    base::Bind(callback,
                                               DBUS_METHOD_CALL_SUCCESS, true));
 }
@@ -229,13 +229,13 @@ void FakeCryptohomeClient::GetSanitizedUsername(
     const StringDBusMethodCallback& callback) {
   DCHECK(!callback.is_null());
 
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(callback,
                  chromeos::DBUS_METHOD_CALL_SUCCESS,
                  username));
   if (!data_handler_.is_null())
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(data_handler_,
                    1,     // async_id
diff --git a/chromeos/dbus/fake_gsm_sms_client.cc b/chromeos/dbus/fake_gsm_sms_client.cc
index 8c63434..49591de 100644
--- a/chromeos/dbus/fake_gsm_sms_client.cc
+++ b/chromeos/dbus/fake_gsm_sms_client.cc
@@ -74,7 +74,7 @@ void FakeGsmSMSClient::RequestUpdate(const std::string& service_name,
   test_index_ = 0;
   // Call PushTestMessageChain asynchronously so that the handler_ callback
   // does not get called from the update request.
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&FakeGsmSMSClient::PushTestMessageChain,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -87,7 +87,7 @@ void FakeGsmSMSClient::PushTestMessageChain() {
 
 void FakeGsmSMSClient::PushTestMessageDelayed() {
   const int kSmsMessageDelaySeconds = 5;
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&FakeGsmSMSClient::PushTestMessageChain,
                  weak_ptr_factory_.GetWeakPtr()),
diff --git a/chromeos/dbus/fake_session_manager_client.cc b/chromeos/dbus/fake_session_manager_client.cc
index 6e5c162..c935f9a 100644
--- a/chromeos/dbus/fake_session_manager_client.cc
+++ b/chromeos/dbus/fake_session_manager_client.cc
@@ -76,29 +76,27 @@ void FakeSessionManagerClient::NotifyLockScreenDismissed() {
 
 void FakeSessionManagerClient::RetrieveActiveSessions(
       const ActiveSessionsCallback& callback) {
-  MessageLoop::current()->PostTask(FROM_HERE,
-                                   base::Bind(callback,
-                                              user_sessions_,
-                                              true));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE, base::Bind(callback, user_sessions_, true));
 }
 
 void FakeSessionManagerClient::RetrieveDevicePolicy(
     const RetrievePolicyCallback& callback) {
-  MessageLoop::current()->PostTask(FROM_HERE,
-                                   base::Bind(callback, device_policy_));
+  base::MessageLoop::current()->PostTask(FROM_HERE,
+                                         base::Bind(callback, device_policy_));
 }
 
 void FakeSessionManagerClient::RetrievePolicyForUser(
     const std::string& username,
     const RetrievePolicyCallback& callback) {
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, user_policies_[username]));
 }
 
 void FakeSessionManagerClient::RetrieveDeviceLocalAccountPolicy(
     const std::string& account_id,
     const RetrievePolicyCallback& callback) {
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, device_local_account_policy_[account_id]));
 }
@@ -107,7 +105,7 @@ void FakeSessionManagerClient::StoreDevicePolicy(
     const std::string& policy_blob,
     const StorePolicyCallback& callback) {
   device_policy_ = policy_blob;
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
+  base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
   FOR_EACH_OBSERVER(Observer, observers_, PropertyChangeComplete(true));
 }
 
@@ -117,7 +115,7 @@ void FakeSessionManagerClient::StorePolicyForUser(
     const std::string& policy_key,
     const StorePolicyCallback& callback) {
   user_policies_[username] = policy_blob;
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
+  base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
 }
 
 void FakeSessionManagerClient::StoreDeviceLocalAccountPolicy(
@@ -125,7 +123,7 @@ void FakeSessionManagerClient::StoreDeviceLocalAccountPolicy(
     const std::string& policy_blob,
     const StorePolicyCallback& callback) {
   device_local_account_policy_[account_id] = policy_blob;
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
+  base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
 }
 
 const std::string& FakeSessionManagerClient::device_policy() const {
diff --git a/chromeos/dbus/gsm_sms_client_unittest.cc b/chromeos/dbus/gsm_sms_client_unittest.cc
index 960a916..6caf93a 100644
--- a/chromeos/dbus/gsm_sms_client_unittest.cc
+++ b/chromeos/dbus/gsm_sms_client_unittest.cc
@@ -159,7 +159,7 @@ class GsmSMSClientTest : public testing::Test {
   // The client to be tested.
   scoped_ptr<GsmSMSClient> client_;
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   // The mock bus.
   scoped_refptr<dbus::MockBus> mock_bus_;
   // The mock object proxy.
diff --git a/chromeos/dbus/ibus/ibus_client_unittest.cc b/chromeos/dbus/ibus/ibus_client_unittest.cc
index a76330a..3220e52 100644
--- a/chromeos/dbus/ibus/ibus_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_client_unittest.cc
@@ -155,7 +155,7 @@ class IBusClientTest : public testing::Test {
   scoped_ptr<IBusClient> client_;
 
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
 
diff --git a/chromeos/dbus/ibus/ibus_config_client_unittest.cc b/chromeos/dbus/ibus/ibus_config_client_unittest.cc
index f49fe86..5e636b9 100644
--- a/chromeos/dbus/ibus/ibus_config_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_config_client_unittest.cc
@@ -330,7 +330,7 @@ class IBusConfigClientTest : public testing::Test {
   scoped_ptr<IBusConfigClient> client_;
 
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
 };
diff --git a/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
index c3c2aa6..146e01a 100644
--- a/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
@@ -39,7 +39,7 @@ class SynchronousCreateEngineHandler {
 class AsynchronousCreateEngineHandler {
  public:
   AsynchronousCreateEngineHandler(const dbus::ObjectPath& path,
-                                  MessageLoop* message_loop)
+                                  base::MessageLoop* message_loop)
       : path_(path),
         message_loop_(message_loop) {}
 
@@ -49,7 +49,7 @@ class AsynchronousCreateEngineHandler {
 
  private:
   dbus::ObjectPath path_;
-  MessageLoop* message_loop_;
+  base::MessageLoop* message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AsynchronousCreateEngineHandler);
 };
@@ -126,7 +126,7 @@ class IBusEngineFactoryServiceTest : public testing::Test {
   std::map<std::string, dbus::ExportedObject::MethodCallCallback>
       method_exported_map_;
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 
  private:
   // Used to implement the method call exportation.
diff --git a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
index 90dd53d..fc9c05f 100644
--- a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
@@ -166,7 +166,7 @@ class ProcessKeyEventHandler {
 class DelayProcessKeyEventHandler {
  public:
   DelayProcessKeyEventHandler(bool expected_value,
-                              MessageLoop* message_loop)
+                              base::MessageLoop* message_loop)
       : expected_value_(expected_value),
         message_loop_(message_loop) {
   }
@@ -181,7 +181,7 @@ class DelayProcessKeyEventHandler {
 
  private:
   bool expected_value_;
-  MessageLoop* message_loop_;
+  base::MessageLoop* message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(DelayProcessKeyEventHandler);
 };
@@ -494,7 +494,7 @@ class IBusEngineServiceTest : public testing::Test {
   // The mock exported object.
   scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   // The map from method call to method call handler.
   std::map<std::string, dbus::ExportedObject::MethodCallCallback>
       method_callback_map_;
diff --git a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
index 8e85a20..d8b4e2d 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
@@ -318,7 +318,7 @@ class IBusInputContextClientTest : public testing::Test {
   dbus::Response* response_;
   dbus::ErrorResponse* error_response_;
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   // The map from signal to signal handler.
   std::map<std::string, dbus::ObjectProxy::SignalCallback> signal_callback_map_;
   // Call count of OnSetCursorLocation.
diff --git a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
index edb9d2c..ec7aa74 100644
--- a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
@@ -325,7 +325,7 @@ class IBusPanelServiceTest : public testing::Test {
   // The mock exported object.
   scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   // The map from method call to method call handler.
   std::map<std::string, dbus::ExportedObject::MethodCallCallback>
       method_callback_map_;
diff --git a/chromeos/dbus/mock_cryptohome_client.cc b/chromeos/dbus/mock_cryptohome_client.cc
index 60927c1..1dc95b4 100644
--- a/chromeos/dbus/mock_cryptohome_client.cc
+++ b/chromeos/dbus/mock_cryptohome_client.cc
@@ -16,7 +16,7 @@ namespace {
 
 // Runs callback with true.
 void RunCallbackWithTrue(const BoolDBusMethodCallback& callback) {
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
 }
 
diff --git a/chromeos/dbus/modem_messaging_client_unittest.cc b/chromeos/dbus/modem_messaging_client_unittest.cc
index f6cf879..9bb6115 100644
--- a/chromeos/dbus/modem_messaging_client_unittest.cc
+++ b/chromeos/dbus/modem_messaging_client_unittest.cc
@@ -137,7 +137,7 @@ class ModemMessagingClientTest : public testing::Test {
   // The client to be tested.
   scoped_ptr<ModemMessagingClient> client_;
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   // The mock bus.
   scoped_refptr<dbus::MockBus> mock_bus_;
   // The mock object proxy.
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index f6c8bac..306ab18 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -782,7 +782,7 @@ class PowerManagerClientStubImpl : public PowerManagerClient {
   virtual void RequestShutdown() OVERRIDE {}
 
   virtual void RequestIdleNotification(int64 threshold) OVERRIDE {
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&PowerManagerClientStubImpl::TriggerIdleNotify,
                    base::Unretained(this),
diff --git a/chromeos/dbus/shill_client_unittest_base.h b/chromeos/dbus/shill_client_unittest_base.h
index 61d4ce0..63dff5d 100644
--- a/chromeos/dbus/shill_client_unittest_base.h
+++ b/chromeos/dbus/shill_client_unittest_base.h
@@ -175,7 +175,7 @@ class ShillClientUnittestBase : public testing::Test {
       const base::DictionaryValue& result);
 
   // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   // The mock bus.
   scoped_refptr<dbus::MockBus> mock_bus_;
 
diff --git a/chromeos/dbus/shill_device_client_stub.cc b/chromeos/dbus/shill_device_client_stub.cc
index b82f0d0..4e63fb4 100644
--- a/chromeos/dbus/shill_device_client_stub.cc
+++ b/chromeos/dbus/shill_device_client_stub.cc
@@ -57,7 +57,7 @@ void ShillDeviceClientStub::GetProperties(
     const DictionaryValueCallback& callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ShillDeviceClientStub::PassStubDeviceProperties,
                  weak_ptr_factory_.GetWeakPtr(),
@@ -87,7 +87,7 @@ void ShillDeviceClientStub::SetProperty(const dbus::ObjectPath& device_path,
     std::string error_name("org.chromium.flimflam.Error.Failure");
     std::string error_message("Failed");
     if (!error_callback.is_null()) {
-      MessageLoop::current()->PostTask(FROM_HERE,
+      base::MessageLoop::current()->PostTask(FROM_HERE,
                                        base::Bind(error_callback,
                                                   error_name,
                                                   error_message));
@@ -95,13 +95,13 @@ void ShillDeviceClientStub::SetProperty(const dbus::ObjectPath& device_path,
     return;
   }
   device_properties->Set(name, value.DeepCopy());
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ShillDeviceClientStub::NotifyObserversPropertyChanged,
                  weak_ptr_factory_.GetWeakPtr(), device_path, name));
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::ClearProperty(
@@ -123,7 +123,7 @@ void ShillDeviceClientStub::AddIPConfig(
     const ObjectPathDBusMethodCallback& callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE,
+  base::MessageLoop::current()->PostTask(FROM_HERE,
                                    base::Bind(callback,
                                               DBUS_METHOD_CALL_SUCCESS,
                                               dbus::ObjectPath()));
@@ -136,7 +136,7 @@ void ShillDeviceClientStub::RequirePin(const dbus::ObjectPath& device_path,
                                        const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::EnterPin(const dbus::ObjectPath& device_path,
@@ -145,7 +145,7 @@ void ShillDeviceClientStub::EnterPin(const dbus::ObjectPath& device_path,
                                      const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::UnblockPin(const dbus::ObjectPath& device_path,
@@ -155,7 +155,7 @@ void ShillDeviceClientStub::UnblockPin(const dbus::ObjectPath& device_path,
                                        const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::ChangePin(const dbus::ObjectPath& device_path,
@@ -165,7 +165,7 @@ void ShillDeviceClientStub::ChangePin(const dbus::ObjectPath& device_path,
                                       const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::Register(const dbus::ObjectPath& device_path,
@@ -174,7 +174,7 @@ void ShillDeviceClientStub::Register(const dbus::ObjectPath& device_path,
                                      const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::SetCarrier(const dbus::ObjectPath& device_path,
@@ -183,7 +183,7 @@ void ShillDeviceClientStub::SetCarrier(const dbus::ObjectPath& device_path,
                                        const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillDeviceClientStub::Reset(const dbus::ObjectPath& device_path,
@@ -191,7 +191,7 @@ void ShillDeviceClientStub::Reset(const dbus::ObjectPath& device_path,
                                   const ErrorCallback& error_callback){
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 ShillDeviceClient::TestInterface* ShillDeviceClientStub::GetTestInterface(){
@@ -288,7 +288,7 @@ void ShillDeviceClientStub::PostVoidCallback(
     DBusMethodCallStatus status) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE,
+  base::MessageLoop::current()->PostTask(FROM_HERE,
                                    base::Bind(callback, status));
 }
 
diff --git a/chromeos/dbus/shill_ipconfig_client_stub.cc b/chromeos/dbus/shill_ipconfig_client_stub.cc
index cac80b4..8bb2884 100644
--- a/chromeos/dbus/shill_ipconfig_client_stub.cc
+++ b/chromeos/dbus/shill_ipconfig_client_stub.cc
@@ -47,7 +47,7 @@ void ShillIPConfigClientStub::GetProperties(
   if (!ipconfigs_.GetDictionaryWithoutPathExpansion(ipconfig_path.value(),
                                                     &dict))
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&ShillIPConfigClientStub::PassProperties,
                               weak_ptr_factory_.GetWeakPtr(),
                               dict,
@@ -78,7 +78,7 @@ void ShillIPConfigClientStub::SetProperty(
     ipconfigs_.SetWithoutPathExpansion(ipconfig_path.value(),
                                        dvalue);
   }
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 }
 
@@ -88,7 +88,7 @@ void ShillIPConfigClientStub::ClearProperty(
     const VoidDBusMethodCallback& callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 }
 
@@ -96,7 +96,7 @@ void ShillIPConfigClientStub::Remove(const dbus::ObjectPath& ipconfig_path,
                                      const VoidDBusMethodCallback& callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 }
 
diff --git a/chromeos/dbus/shill_manager_client_stub.cc b/chromeos/dbus/shill_manager_client_stub.cc
index 6e20a6a..2949332 100644
--- a/chromeos/dbus/shill_manager_client_stub.cc
+++ b/chromeos/dbus/shill_manager_client_stub.cc
@@ -61,7 +61,7 @@ void ShillManagerClientStub::GetProperties(
     const DictionaryValueCallback& callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(
           &ShillManagerClientStub::PassStubProperties,
           weak_ptr_factory_.GetWeakPtr(),
@@ -76,7 +76,7 @@ void ShillManagerClientStub::GetNetworksForGeolocation(
     const DictionaryValueCallback& callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(
           &ShillManagerClientStub::PassStubGeoNetworks,
           weak_ptr_factory_.GetWeakPtr(),
@@ -90,7 +90,7 @@ void ShillManagerClientStub::SetProperty(const std::string& name,
   stub_properties_.SetWithoutPathExpansion(name, value.DeepCopy());
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillManagerClientStub::RequestScan(const std::string& type,
@@ -114,7 +114,7 @@ void ShillManagerClientStub::RequestScan(const std::string& type,
       chromeos::switches::kEnableStubInteractive)) {
     scan_duration_seconds = 0;
   }
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ShillManagerClientStub::ScanCompleted,
                  weak_ptr_factory_.GetWeakPtr(), device_path, callback),
@@ -129,8 +129,8 @@ void ShillManagerClientStub::EnableTechnology(
   if (!stub_properties_.GetListWithoutPathExpansion(
       flimflam::kEnabledTechnologiesProperty, &enabled_list)) {
     if (!error_callback.is_null()) {
-      MessageLoop::current()->PostTask(FROM_HERE, callback);
-      MessageLoop::current()->PostTask(
+      base::MessageLoop::current()->PostTask(FROM_HERE, callback);
+      base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(error_callback, "StubError", "Property not found"));
     }
@@ -139,7 +139,7 @@ void ShillManagerClientStub::EnableTechnology(
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableStubInteractive)) {
     const int kEnableTechnologyDelaySeconds = 3;
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&ShillManagerClientStub::SetTechnologyEnabled,
                    weak_ptr_factory_.GetWeakPtr(), type, callback, true),
@@ -157,7 +157,7 @@ void ShillManagerClientStub::DisableTechnology(
   if (!stub_properties_.GetListWithoutPathExpansion(
       flimflam::kEnabledTechnologiesProperty, &enabled_list)) {
     if (!error_callback.is_null()) {
-      MessageLoop::current()->PostTask(
+      base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(error_callback, "StubError", "Property not found"));
     }
@@ -166,7 +166,7 @@ void ShillManagerClientStub::DisableTechnology(
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableStubInteractive)) {
     const int kDisableTechnologyDelaySeconds = 3;
-    MessageLoop::current()->PostDelayedTask(
+    base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&ShillManagerClientStub::SetTechnologyEnabled,
                    weak_ptr_factory_.GetWeakPtr(), type, callback, false),
@@ -191,7 +191,7 @@ void ShillManagerClientStub::ConfigureService(
     // If the properties aren't filled out completely, then just return an empty
     // object path.
     if (!callback.is_null()) {
-      MessageLoop::current()->PostTask(
+      base::MessageLoop::current()->PostTask(
           FROM_HERE, base::Bind(callback, dbus::ObjectPath()));
     }
     return;
@@ -232,7 +232,7 @@ void ShillManagerClientStub::ConfigureService(
   profile_test->AddService(service_path);
 
   if (!callback.is_null()) {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, dbus::ObjectPath(service_path)));
   }
 }
@@ -256,7 +256,7 @@ void ShillManagerClientStub::GetService(
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, dbus::ObjectPath()));
 }
 
@@ -266,7 +266,7 @@ void ShillManagerClientStub::VerifyDestination(
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
+  base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
 }
 
 void ShillManagerClientStub::VerifyAndEncryptCredentials(
@@ -276,7 +276,7 @@ void ShillManagerClientStub::VerifyAndEncryptCredentials(
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, "encrypted_credentials"));
 }
 
@@ -287,7 +287,7 @@ void ShillManagerClientStub::VerifyAndEncryptData(
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE,
+  base::MessageLoop::current()->PostTask(FROM_HERE,
                                    base::Bind(callback, "encrypted_data"));
 }
 
@@ -494,7 +494,7 @@ void ShillManagerClientStub::CallNotifyObserversPropertyChanged(
           chromeos::switches::kEnableStubInteractive)) {
     delay_ms = 0;
   }
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ShillManagerClientStub::NotifyObserversPropertyChanged,
                  weak_ptr_factory_.GetWeakPtr(),
@@ -562,7 +562,7 @@ void ShillManagerClientStub::SetTechnologyEnabled(
   CallNotifyObserversPropertyChanged(
       flimflam::kEnabledTechnologiesProperty, 0 /* already delayed */);
   if (!callback.is_null())
-    MessageLoop::current()->PostTask(FROM_HERE, callback);
+    base::MessageLoop::current()->PostTask(FROM_HERE, callback);
   // May affect available services
   CallNotifyObserversPropertyChanged(flimflam::kServicesProperty, 0);
   CallNotifyObserversPropertyChanged(flimflam::kServiceWatchListProperty, 0);
@@ -609,7 +609,7 @@ void ShillManagerClientStub::ScanCompleted(const std::string& device_path,
   CallNotifyObserversPropertyChanged(flimflam::kServiceWatchListProperty,
                                      0);
   if (!callback.is_null())
-    MessageLoop::current()->PostTask(FROM_HERE, callback);
+    base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/shill_profile_client_stub.cc b/chromeos/dbus/shill_profile_client_stub.cc
index 082469a..e023237 100644
--- a/chromeos/dbus/shill_profile_client_stub.cc
+++ b/chromeos/dbus/shill_profile_client_stub.cc
@@ -74,7 +74,7 @@ void ShillProfileClientStub::GetProperties(
     entry_paths->AppendString(it.key());
   }
 
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PassDictionary, callback, base::Owned(properties.release())));
 }
@@ -95,7 +95,7 @@ void ShillProfileClientStub::GetEntry(
     return;
   }
 
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PassDictionary, callback, base::Owned(entry->DeepCopy())));
 }
@@ -113,7 +113,7 @@ void ShillProfileClientStub::DeleteEntry(const dbus::ObjectPath& profile_path,
     return;
   }
 
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 ShillProfileClient::TestInterface* ShillProfileClientStub::GetTestInterface() {
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc
index d4e131d..0c0d2f93 100644
--- a/chromeos/dbus/shill_service_client_stub.cc
+++ b/chromeos/dbus/shill_service_client_stub.cc
@@ -86,7 +86,7 @@ void ShillServiceClientStub::GetProperties(
     call_status = DBUS_METHOD_CALL_FAILURE;
   }
 
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PassStubServiceProperties,
                  callback,
@@ -120,13 +120,13 @@ void ShillServiceClientStub::SetProperty(const dbus::ObjectPath& service_path,
     }
   }
   dict->SetWithoutPathExpansion(name, value.DeepCopy());
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::NotifyObserversPropertyChanged,
                  weak_ptr_factory_.GetWeakPtr(), service_path, name));
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillServiceClientStub::ClearProperty(
@@ -141,13 +141,13 @@ void ShillServiceClientStub::ClearProperty(
     return;
   }
   dict->Remove(name, NULL);
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::NotifyObserversPropertyChanged,
                  weak_ptr_factory_.GetWeakPtr(), service_path, name));
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillServiceClientStub::ClearProperties(
@@ -169,7 +169,7 @@ void ShillServiceClientStub::ClearProperties(
   }
   for (std::vector<std::string>::const_iterator iter = names.begin();
       iter != names.end(); ++iter) {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &ShillServiceClientStub::NotifyObserversPropertyChanged,
@@ -177,7 +177,7 @@ void ShillServiceClientStub::ClearProperties(
   }
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PassStubListValue,
                  callback, base::Owned(results.release())));
@@ -204,7 +204,7 @@ void ShillServiceClientStub::Connect(const dbus::ObjectPath& service_path,
   }
   // Set Online after a delay
   base::StringValue online_value(flimflam::kStateOnline);
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::SetProperty,
                  weak_ptr_factory_.GetWeakPtr(),
@@ -233,7 +233,7 @@ void ShillServiceClientStub::Disconnect(const dbus::ObjectPath& service_path,
   }
   // Set Idle after a delay
   base::StringValue idle_value(flimflam::kStateIdle);
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::SetProperty,
                  weak_ptr_factory_.GetWeakPtr(),
@@ -251,7 +251,7 @@ void ShillServiceClientStub::Remove(const dbus::ObjectPath& service_path,
                                     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillServiceClientStub::ActivateCellularModem(
@@ -261,7 +261,7 @@ void ShillServiceClientStub::ActivateCellularModem(
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void ShillServiceClientStub::CompleteCellularActivation(
@@ -270,7 +270,7 @@ void ShillServiceClientStub::CompleteCellularActivation(
     const ErrorCallback& error_callback) {
   if (callback.is_null())
     return;
-  MessageLoop::current()->PostTask(FROM_HERE, callback);
+  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 bool ShillServiceClientStub::CallActivateCellularModemAndBlock(
diff --git a/chromeos/dbus/sms_client.cc b/chromeos/dbus/sms_client.cc
index 2b578d0..0e136b0 100644
--- a/chromeos/dbus/sms_client.cc
+++ b/chromeos/dbus/sms_client.cc
@@ -101,7 +101,7 @@ class SMSClientStubImpl : public SMSClient {
     // Run callback asynchronously.
     if (callback.is_null())
       return;
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&SMSClientStubImpl::OnGetAll,
                    weak_ptr_factory_.GetWeakPtr(),
diff --git a/chromeos/disks/disk_mount_manager_unittest.cc b/chromeos/disks/disk_mount_manager_unittest.cc
index aa1b1f4..3161818 100644
--- a/chromeos/disks/disk_mount_manager_unittest.cc
+++ b/chromeos/disks/disk_mount_manager_unittest.cc
@@ -200,7 +200,7 @@ class DiskMountManagerTest : public testing::Test {
  protected:
   chromeos::FakeCrosDisksClient* fake_cros_disks_client_;
   MockDiskMountManagerObserver observer_;
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
 };
 
 // Tests that the observer gets notified on attempt to format non existent mount
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h
index 96c38b3..da43da7 100644
--- a/chromeos/display/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -38,7 +38,8 @@ enum OutputState {
 
 // This class interacts directly with the underlying Xrandr API to manipulate
 // CTRCs and Outputs.
-class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher {
+class CHROMEOS_EXPORT OutputConfigurator
+    : public base::MessageLoop::Dispatcher {
  public:
   // Information about an output's current state.
   struct OutputSnapshot {
diff --git a/chromeos/ime/xkeyboard_unittest.cc b/chromeos/ime/xkeyboard_unittest.cc
index af71702..7c3deea 100644
--- a/chromeos/ime/xkeyboard_unittest.cc
+++ b/chromeos/ime/xkeyboard_unittest.cc
@@ -35,7 +35,7 @@ class XKeyboardTest : public testing::Test {
 
   scoped_ptr<XKeyboard> xkey_;
 
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
 };
 
 // Returns true if X display is available.
diff --git a/chromeos/login/login_state_unittest.cc b/chromeos/login/login_state_unittest.cc
index 3522e49..49b22e2 100644
--- a/chromeos/login/login_state_unittest.cc
+++ b/chromeos/login/login_state_unittest.cc
@@ -45,7 +45,7 @@ class LoginStateTest : public testing::Test,
   }
 
  protected:
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   LoginState::LoggedInState logged_in_state_;
   LoginState::LoggedInUserType logged_in_user_type_;
 
diff --git a/chromeos/memory/low_memory_listener.cc b/chromeos/memory/low_memory_listener.cc
index a53e7b7..23d1dae 100644
--- a/chromeos/memory/low_memory_listener.cc
+++ b/chromeos/memory/low_memory_listener.cc
@@ -72,7 +72,7 @@ class LowMemoryListenerImpl
   void StartWatchingDescriptor();
 
   // Delegate to receive events from WatchFileDescriptor.
-  class FileWatcherDelegate : public MessageLoopForIO::Watcher {
+  class FileWatcherDelegate : public base::MessageLoopForIO::Watcher {
    public:
     explicit FileWatcherDelegate(LowMemoryListenerImpl* owner)
         : owner_(owner) {}
@@ -94,7 +94,7 @@ class LowMemoryListenerImpl
     DISALLOW_COPY_AND_ASSIGN(FileWatcherDelegate);
   };
 
-  scoped_ptr<MessageLoopForIO::FileDescriptorWatcher> watcher_;
+  scoped_ptr<base::MessageLoopForIO::FileDescriptorWatcher> watcher_;
   FileWatcherDelegate watcher_delegate_;
   int file_descriptor_;
   base::OneShotTimer<LowMemoryListenerImpl> timer_;
@@ -110,7 +110,7 @@ void LowMemoryListenerImpl::StartObservingOnFileThread(
       << "Attempted to start observation when it was already started.";
   DCHECK(watcher_.get() == NULL);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  DCHECK(MessageLoopForIO::current());
+  DCHECK(base::MessageLoopForIO::current());
 
   file_descriptor_ = ::open(kLowMemFile, O_RDONLY);
   // Don't report this error unless we're really running on ChromeOS
@@ -119,7 +119,7 @@ void LowMemoryListenerImpl::StartObservingOnFileThread(
     PLOG(ERROR) << "Unable to open " << kLowMemFile;
     return;
   }
-  watcher_.reset(new MessageLoopForIO::FileDescriptorWatcher);
+  watcher_.reset(new base::MessageLoopForIO::FileDescriptorWatcher);
   StartWatchingDescriptor();
 }
 
@@ -144,13 +144,13 @@ void LowMemoryListenerImpl::ScheduleNextObservation() {
 void LowMemoryListenerImpl::StartWatchingDescriptor() {
   DCHECK(watcher_.get());
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  DCHECK(MessageLoopForIO::current());
+  DCHECK(base::MessageLoopForIO::current());
   if (file_descriptor_ < 0)
     return;
-  if (!MessageLoopForIO::current()->WatchFileDescriptor(
+  if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
           file_descriptor_,
           false,  // persistent=false: We want it to fire once and reschedule.
-          MessageLoopForIO::WATCH_READ,
+          base::MessageLoopForIO::WATCH_READ,
           watcher_.get(),
           &watcher_delegate_)) {
     LOG(ERROR) << "Unable to watch " << kLowMemFile;
diff --git a/chromeos/network/cert_loader.cc b/chromeos/network/cert_loader.cc
index 4a31586..f75f8bb 100644
--- a/chromeos/network/cert_loader.cc
+++ b/chromeos/network/cert_loader.cc
@@ -150,7 +150,7 @@ void CertLoader::InitializeTokenAndLoadCertificates() {
 
 void CertLoader::RetryTokenInitializationLater() {
   LOG(WARNING) << "Re-Requesting Certificates later.";
-  MessageLoop::current()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&CertLoader::InitializeTokenAndLoadCertificates,
                  initialize_token_factory_.GetWeakPtr()),
diff --git a/chromeos/network/geolocation_handler_unittest.cc b/chromeos/network/geolocation_handler_unittest.cc
index 74e86cd..7efce11 100644
--- a/chromeos/network/geolocation_handler_unittest.cc
+++ b/chromeos/network/geolocation_handler_unittest.cc
@@ -62,7 +62,7 @@ class GeolocationHandlerTest : public testing::Test {
   }
 
  protected:
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   scoped_ptr<GeolocationHandler> geolocation_handler_;
   ShillManagerClient::TestInterface* manager_test_;
   WifiAccessPointVector wifi_access_points_;
diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc
index 3ea8cec..2b4d0be 100644
--- a/chromeos/network/managed_network_configuration_handler_unittest.cc
+++ b/chromeos/network/managed_network_configuration_handler_unittest.cc
@@ -259,7 +259,7 @@ class ManagedNetworkConfigurationHandlerTest : public testing::Test {
   scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
   scoped_ptr<ManagedNetworkConfigurationHandler>
         managed_network_configuration_handler_;
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerTest);
diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc
index 04fa4ad..fb997d7 100644
--- a/chromeos/network/network_configuration_handler_unittest.cc
+++ b/chromeos/network/network_configuration_handler_unittest.cc
@@ -154,7 +154,7 @@ class NetworkConfigurationHandlerTest : public testing::Test {
   MockShillServiceClient* mock_service_client_;
   scoped_ptr<NetworkStateHandler> network_state_handler_;
   scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   base::DictionaryValue* dictionary_value_result_;
 };
 
diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc
index e5d02bf..5c09b9b 100644
--- a/chromeos/network/network_connection_handler_unittest.cc
+++ b/chromeos/network/network_connection_handler_unittest.cc
@@ -120,7 +120,7 @@ class NetworkConnectionHandlerTest : public testing::Test {
   scoped_ptr<NetworkStateHandler> network_state_handler_;
   scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
   scoped_ptr<NetworkConnectionHandler> network_connection_handler_;
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   std::string result_;
 
  private:
diff --git a/chromeos/network/network_sms_handler_unittest.cc b/chromeos/network/network_sms_handler_unittest.cc
index 62f9f6a..df47b4b 100644
--- a/chromeos/network/network_sms_handler_unittest.cc
+++ b/chromeos/network/network_sms_handler_unittest.cc
@@ -73,7 +73,7 @@ class NetworkSmsHandlerTest : public testing::Test {
   }
 
  protected:
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
 };
 
 TEST_F(NetworkSmsHandlerTest, SmsHandlerDbusStub) {
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index 0cd0585..271bbb8 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -181,7 +181,7 @@ class NetworkStateHandlerTest : public testing::Test {
                              add_to_watchlist);
   }
 
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   scoped_ptr<NetworkStateHandler> network_state_handler_;
   scoped_ptr<TestObserver> test_observer_;
 
diff --git a/chromeos/network/shill_property_handler_unittest.cc b/chromeos/network/shill_property_handler_unittest.cc
index a3ee1d4..0fa49c1 100644
--- a/chromeos/network/shill_property_handler_unittest.cc
+++ b/chromeos/network/shill_property_handler_unittest.cc
@@ -236,7 +236,7 @@ class ShillPropertyHandlerTest : public testing::Test {
                flimflam::kStateIdle, add_to_watchlist);
   }
 
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   scoped_ptr<TestListener> listener_;
   scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
   ShillManagerClient::TestInterface* manager_test_;
diff --git a/chromeos/power/power_manager_handler_unittest.cc b/chromeos/power/power_manager_handler_unittest.cc
index 888077c..e66c7cb 100644
--- a/chromeos/power/power_manager_handler_unittest.cc
+++ b/chromeos/power/power_manager_handler_unittest.cc
@@ -73,7 +73,7 @@ class PowerManagerHandlerTest : public testing::Test {
   }
 
  protected:
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   scoped_ptr<PowerManagerHandler> power_handler_;
   scoped_ptr<TestObserver> test_observer_;
 
diff --git a/chromeos/process_proxy/process_proxy_unittest.cc b/chromeos/process_proxy/process_proxy_unittest.cc
index ad0ba4b..c98c80c 100644
--- a/chromeos/process_proxy/process_proxy_unittest.cc
+++ b/chromeos/process_proxy/process_proxy_unittest.cc
@@ -77,8 +77,8 @@ class RegistryTestRunner : public TestRunner {
     }
 
     if (!valid || TestSucceeded()) {
-      MessageLoop::current()->PostTask(FROM_HERE,
-                                       MessageLoop::QuitClosure());
+      base::MessageLoop::current()->PostTask(FROM_HERE,
+                                             base::MessageLoop::QuitClosure());
     }
   }
 
@@ -137,8 +137,8 @@ class RegistryNotifiedOnProcessExitTestRunner : public TestRunner {
       return;
     }
     EXPECT_EQ("exit", type);
-    MessageLoop::current()->PostTask(FROM_HERE,
-                                     MessageLoop::QuitClosure());
+    base::MessageLoop::current()->PostTask(FROM_HERE,
+                                           base::MessageLoop::QuitClosure());
   }
 
   virtual void StartRegistryTest(ProcessProxyRegistry* registry) OVERRIDE {
@@ -163,8 +163,8 @@ class SigIntTestRunner : public TestRunner {
     // We may receive ^C on stdout, but we don't care about that, as long as we
     // eventually received exit event.
     if (type == "exit") {
-      MessageLoop::current()->PostTask(FROM_HERE,
-                                       MessageLoop::QuitClosure());
+      base::MessageLoop::current()->PostTask(FROM_HERE,
+                                             base::MessageLoop::QuitClosure());
     }
   }
 
@@ -202,27 +202,27 @@ class ProcessProxyTest : public testing::Test {
     if (status == base::TERMINATION_STATUS_STILL_RUNNING)
       base::KillProcess(pid_, 0, true);
 
-    MessageLoop::current()->PostTask(FROM_HERE,
-                                     MessageLoop::QuitClosure());
+    base::MessageLoop::current()->PostTask(FROM_HERE,
+                                           base::MessageLoop::QuitClosure());
   }
 
   void RunTest() {
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ProcessProxyTest::InitRegistryTest,
                    base::Unretained(this)));
 
     // Wait until all data from output watcher is received (QuitTask will be
     // fired on watcher thread).
-    MessageLoop::current()->Run();
+    base::MessageLoop::current()->Run();
 
-    MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ProcessProxyTest::EndRegistryTest,
                    base::Unretained(this)));
 
     // Wait until we clean up the process proxy.
-    MessageLoop::current()->Run();
+    base::MessageLoop::current()->Run();
   }
 
   scoped_ptr<TestRunner> test_runner_;
@@ -231,7 +231,7 @@ class ProcessProxyTest : public testing::Test {
   ProcessProxyRegistry* registry_;
   pid_t pid_;
 
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 };
 
 // Test will open new process that will run cat command, and verify data we