Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/dbus/dbus_client_bundle.cc

Index: chromeos/dbus/dbus_client_bundle.cc
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index 4ab8f3ed763bce1c6605ec1d869db076a7057223..159b3f2b368058003705052bd6c4521bb0451825 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -220,7 +220,7 @@ DBusClientBundle::DBusClientBundle() {
   if (!DBusThreadManager::IsUsingStub(MODEM_MESSAGING))
     modem_messaging_client_.reset(ModemMessagingClient::Create());
   else
-    modem_messaging_client_.reset(ModemMessagingClient::Create());
+    modem_messaging_client_.reset(new FakeModemMessagingClient);
 
   // Create the NFC clients in the correct order based on their dependencies.
   if (!DBusThreadManager::IsUsingStub(NFC)) {
@@ -246,12 +246,12 @@ DBusClientBundle::DBusClientBundle() {
     permission_broker_client_.reset(new FakePermissionBrokerClient);
 
   power_manager_client_.reset(PowerManagerClient::Create(
-      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+      DBusThreadManager::IsUsingStub(POWER_MANAGER) ?
           STUB_DBUS_CLIENT_IMPLEMENTATION :
           REAL_DBUS_CLIENT_IMPLEMENTATION));
 
   session_manager_client_.reset(SessionManagerClient::Create(
-      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+      DBusThreadManager::IsUsingStub(SESSION_MANAGER) ?
           STUB_DBUS_CLIENT_IMPLEMENTATION :
           REAL_DBUS_CLIENT_IMPLEMENTATION));
 
@@ -266,7 +266,7 @@ DBusClientBundle::DBusClientBundle() {
     system_clock_client_.reset(new FakeSystemClockClient);
 
   update_engine_client_.reset(UpdateEngineClient::Create(
-      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+      DBusThreadManager::IsUsingStub(UPDATE_ENGINE) ?
           STUB_DBUS_CLIENT_IMPLEMENTATION :
           REAL_DBUS_CLIENT_IMPLEMENTATION));
 }