Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/dbus/dbus_client_bundle.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/dbus_client_bundle.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 202 matching lines @@
     image_burner_client_.reset(new FakeImageBurnerClient);
 
   if (!DBusThreadManager::IsUsingStub(INTROSPECTABLE))
     introspectable_client_.reset(IntrospectableClient::Create());
   else
     introspectable_client_.reset(new FakeIntrospectableClient);
 
   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)) {
     nfc_manager_client_.reset(NfcManagerClient::Create());
     nfc_adapter_client_.reset(
         NfcAdapterClient::Create(nfc_manager_client_.get()));
     nfc_device_client_.reset(
         NfcDeviceClient::Create(nfc_adapter_client_.get()));
     nfc_tag_client_.reset(NfcTagClient::Create(nfc_adapter_client_.get()));
     nfc_record_client_.reset(NfcRecordClient::Create(nfc_device_client_.get(),
                                                      nfc_tag_client_.get()));
   } else {
     nfc_manager_client_.reset(new FakeNfcManagerClient);
     nfc_adapter_client_.reset(new FakeNfcAdapterClient);
     nfc_device_client_.reset(new FakeNfcDeviceClient);
     nfc_tag_client_.reset(new FakeNfcTagClient);
     nfc_record_client_.reset(new FakeNfcRecordClient);
   }
 
   if (!DBusThreadManager::IsUsingStub(PERMISSION_BROKER))
     permission_broker_client_.reset(PermissionBrokerClient::Create());
   else
     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));
 
   if (!DBusThreadManager::IsUsingStub(SMS))
     sms_client_.reset(SMSClient::Create());
   else
     sms_client_.reset(new FakeSMSClient);
 
   if (!DBusThreadManager::IsUsingStub(SYSTEM_CLOCK))
     system_clock_client_.reset(SystemClockClient::Create());
   else
     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));
 }
 
 DBusClientBundle::~DBusClientBundle() {
 }
 
 void DBusClientBundle::SetupDefaultEnvironment() {
   ShillManagerClient::TestInterface* manager =
       shill_manager_client_->GetTestInterface();
@@ skipping 16 matching lines @@
       unstub_mask |= client;
     } else {
       LOG(ERROR) << "Unknown dbus client: " << *iter;
     }
   }
 
   return unstub_mask;
 }
 
 }  // namespace chromeos