Merged MixedDBusThreadManager functionality into DBusClientBundle.

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 b5ccb8ed95ec70d709fd8f759236435b976f95c5..4ab8f3ed763bce1c6605ec1d869db076a7057223 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -4,8 +4,10 @@
 
 #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"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
@@ -16,11 +18,42 @@
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
+#include "chromeos/dbus/cras_audio_client_stub_impl.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/easy_unlock_client.h"
+#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
+#include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
+#include "chromeos/dbus/fake_bluetooth_device_client.h"
+#include "chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h"
+#include "chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h"
+#include "chromeos/dbus/fake_bluetooth_gatt_manager_client.h"
+#include "chromeos/dbus/fake_bluetooth_gatt_service_client.h"
+#include "chromeos/dbus/fake_bluetooth_input_client.h"
+#include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
+#include "chromeos/dbus/fake_cryptohome_client.h"
+#include "chromeos/dbus/fake_debug_daemon_client.h"
+#include "chromeos/dbus/fake_easy_unlock_client.h"
+#include "chromeos/dbus/fake_gsm_sms_client.h"
+#include "chromeos/dbus/fake_image_burner_client.h"
+#include "chromeos/dbus/fake_introspectable_client.h"
+#include "chromeos/dbus/fake_lorgnette_manager_client.h"
+#include "chromeos/dbus/fake_modem_messaging_client.h"
+#include "chromeos/dbus/fake_nfc_adapter_client.h"
+#include "chromeos/dbus/fake_nfc_device_client.h"
+#include "chromeos/dbus/fake_nfc_manager_client.h"
+#include "chromeos/dbus/fake_nfc_record_client.h"
+#include "chromeos/dbus/fake_nfc_tag_client.h"
+#include "chromeos/dbus/fake_permission_broker_client.h"
+#include "chromeos/dbus/fake_shill_device_client.h"
+#include "chromeos/dbus/fake_shill_ipconfig_client.h"
+#include "chromeos/dbus/fake_shill_manager_client.h"
+#include "chromeos/dbus/fake_shill_profile_client.h"
+#include "chromeos/dbus/fake_shill_service_client.h"
+#include "chromeos/dbus/fake_sms_client.h"
+#include "chromeos/dbus/fake_system_clock_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
@@ -89,8 +122,6 @@ DBusClientBundle::DBusClientType GetDBusClientType(
 }  // namespace
 
 DBusClientBundle::DBusClientBundle() {
-  const DBusClientImplementationType type = REAL_DBUS_CLIENT_IMPLEMENTATION;
-
   if (!DBusThreadManager::IsUsingStub(BLUETOOTH)) {
     bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create());
     bluetooth_agent_manager_client_.reset(
@@ -107,25 +138,50 @@ DBusClientBundle::DBusClientBundle() {
         BluetoothGattManagerClient::Create());
     bluetooth_gatt_service_client_.reset(
         BluetoothGattServiceClient::Create());
+  } else {
+    bluetooth_adapter_client_.reset(new FakeBluetoothAdapterClient);
+    bluetooth_agent_manager_client_.reset(new FakeBluetoothAgentManagerClient);
+    bluetooth_device_client_.reset(new FakeBluetoothDeviceClient);
+    bluetooth_input_client_.reset(new FakeBluetoothInputClient);
+    bluetooth_profile_manager_client_.reset(
+        new FakeBluetoothProfileManagerClient);
+    bluetooth_gatt_characteristic_client_.reset(
+        new FakeBluetoothGattCharacteristicClient);
+    bluetooth_gatt_descriptor_client_.reset(
+        new FakeBluetoothGattDescriptorClient);
+    bluetooth_gatt_manager_client_.reset(new FakeBluetoothGattManagerClient);
+    bluetooth_gatt_service_client_.reset(new FakeBluetoothGattServiceClient);
   }
 
   if (!DBusThreadManager::IsUsingStub(CRAS))
     cras_audio_client_.reset(CrasAudioClient::Create());
+  else
+    cras_audio_client_.reset(new CrasAudioClientStubImpl);
 
-  if (!DBusThreadManager::IsUsingStub(CROS_DISKS))
-    cros_disks_client_.reset(CrosDisksClient::Create(type));
+  cros_disks_client_.reset(CrosDisksClient::Create(
+      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+          STUB_DBUS_CLIENT_IMPLEMENTATION :
+          REAL_DBUS_CLIENT_IMPLEMENTATION));
 
   if (!DBusThreadManager::IsUsingStub(CRYPTOHOME))
     cryptohome_client_.reset(CryptohomeClient::Create());
+  else
+    cryptohome_client_.reset(new FakeCryptohomeClient);
 
   if (!DBusThreadManager::IsUsingStub(DEBUG_DAEMON))
     debug_daemon_client_.reset(DebugDaemonClient::Create());
+  else
+    debug_daemon_client_.reset(new FakeDebugDaemonClient);
 
   if (!DBusThreadManager::IsUsingStub(EASY_UNLOCK))
     easy_unlock_client_.reset(EasyUnlockClient::Create());
+  else
+    easy_unlock_client_.reset(new FakeEasyUnlockClient);
 
   if (!DBusThreadManager::IsUsingStub(LORGNETTE_MANAGER))
     lorgnette_manager_client_.reset(LorgnetteManagerClient::Create());
+  else
+    lorgnette_manager_client_.reset(new FakeLorgnetteManagerClient);
 
   if (!DBusThreadManager::IsUsingStub(SHILL)) {
     shill_manager_client_.reset(ShillManagerClient::Create());
@@ -133,19 +189,38 @@ DBusClientBundle::DBusClientBundle() {
     shill_ipconfig_client_.reset(ShillIPConfigClient::Create());
     shill_service_client_.reset(ShillServiceClient::Create());
     shill_profile_client_.reset(ShillProfileClient::Create());
+  } else {
+    shill_manager_client_.reset(new FakeShillManagerClient);
+    shill_device_client_.reset(new FakeShillDeviceClient);
+    shill_ipconfig_client_.reset(new FakeShillIPConfigClient);
+    shill_service_client_.reset(new FakeShillServiceClient);
+    shill_profile_client_.reset(new FakeShillProfileClient);
   }
 
-  if (!DBusThreadManager::IsUsingStub(GSM_SMS))
+  if (!DBusThreadManager::IsUsingStub(GSM_SMS)) {
     gsm_sms_client_.reset(GsmSMSClient::Create());
+  } else {
+    FakeGsmSMSClient* gsm_sms_client = new FakeGsmSMSClient();
+    gsm_sms_client->set_sms_test_message_switch_present(
+        CommandLine::ForCurrentProcess()->HasSwitch(
+            chromeos::switches::kSmsTestMessages));
+    gsm_sms_client_.reset(gsm_sms_client);
+  }
 
   if (!DBusThreadManager::IsUsingStub(IMAGE_BURNER))
     image_burner_client_.reset(ImageBurnerClient::Create());
+  else
+    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());
 
   // Create the NFC clients in the correct order based on their dependencies.
   if (!DBusThreadManager::IsUsingStub(NFC)) {
@@ -157,30 +232,55 @@ DBusClientBundle::DBusClientBundle() {
     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);
 
-  if (!DBusThreadManager::IsUsingStub(POWER_MANAGER))
-    power_manager_client_.reset(PowerManagerClient::Create(type));
+  power_manager_client_.reset(PowerManagerClient::Create(
+      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+          STUB_DBUS_CLIENT_IMPLEMENTATION :
+          REAL_DBUS_CLIENT_IMPLEMENTATION));
 
-  if (!DBusThreadManager::IsUsingStub(SESSION_MANAGER))
-    session_manager_client_.reset(SessionManagerClient::Create(type));
+  session_manager_client_.reset(SessionManagerClient::Create(
+      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+          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);
 
-  if (!DBusThreadManager::IsUsingStub(UPDATE_ENGINE))
-    update_engine_client_.reset(UpdateEngineClient::Create(type));
+  update_engine_client_.reset(UpdateEngineClient::Create(
+      DBusThreadManager::IsUsingStub(CROS_DISKS) ?
+          STUB_DBUS_CLIENT_IMPLEMENTATION :
+          REAL_DBUS_CLIENT_IMPLEMENTATION));
 }
 
 DBusClientBundle::~DBusClientBundle() {
 }
 
+void DBusClientBundle::SetupDefaultEnvironment() {
+  ShillManagerClient::TestInterface* manager =
+      shill_manager_client_->GetTestInterface();
+  if (manager)
+    manager->SetupDefaultEnvironment();
+}
+
 // static
 DBusClientBundle::DBusClientTypeMask DBusClientBundle::ParseUnstubList(
     const std::string& unstub_list) {