Remove fake client creation from DBusClients' Create() functions.

chromeos/dbus/dbus_thread_manager.cc

Index: chromeos/dbus/dbus_thread_manager.cc
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index 87c61adc865bf99b342a05529ab89b2b37eb01c0..7a8a417308bca4e94017fb88e9835190e59e9bf5 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -20,7 +20,6 @@
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client.h"
-#include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
@@ -224,9 +223,8 @@ class DBusThreadManagerImpl : public DBusThreadManager {
   }
 
  private:
-  // Constructs all clients -- stub or real implementation according to
-  // |client_type| and |client_type_override| -- and stores them in the
-  // respective *_client_ member variable.
+  // Constructs all clients and stores them in the respective *_client_ member
+  // variable.
   void CreateDefaultClients() {
     DBusClientImplementationType client_type = REAL_DBUS_CLIENT_IMPLEMENTATION;
     DBusClientImplementationType client_type_override =
@@ -238,49 +236,41 @@ class DBusThreadManagerImpl : public DBusThreadManager {
       client_type_override = STUB_DBUS_CLIENT_IMPLEMENTATION;
     }
 
-    bluetooth_adapter_client_.reset(
-        BluetoothAdapterClient::Create(client_type));
+    bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create());
     bluetooth_agent_manager_client_.reset(
-        BluetoothAgentManagerClient::Create(client_type));
-    bluetooth_device_client_.reset(BluetoothDeviceClient::Create(client_type));
-    bluetooth_input_client_.reset(BluetoothInputClient::Create(client_type));
+        BluetoothAgentManagerClient::Create());
+    bluetooth_device_client_.reset(BluetoothDeviceClient::Create());
+    bluetooth_input_client_.reset(BluetoothInputClient::Create());
     bluetooth_profile_manager_client_.reset(
-        BluetoothProfileManagerClient::Create(client_type));
-    cras_audio_client_.reset(CrasAudioClient::Create(client_type));
+        BluetoothProfileManagerClient::Create());
+    cras_audio_client_.reset(CrasAudioClient::Create());
     cros_disks_client_.reset(CrosDisksClient::Create(client_type));
-    cryptohome_client_.reset(CryptohomeClient::Create(client_type));
+    cryptohome_client_.reset(CryptohomeClient::Create());
     debug_daemon_client_.reset(DebugDaemonClient::Create());
-    shill_manager_client_.reset(
-        ShillManagerClient::Create(client_type_override));
-    shill_device_client_.reset(
-        ShillDeviceClient::Create(client_type_override));
-    shill_ipconfig_client_.reset(
-        ShillIPConfigClient::Create(client_type_override));
-    shill_service_client_.reset(
-        ShillServiceClient::Create(client_type_override));
-    shill_profile_client_.reset(
-        ShillProfileClient::Create(client_type_override));
-    gsm_sms_client_.reset(GsmSMSClient::Create(client_type_override));
-    image_burner_client_.reset(ImageBurnerClient::Create(client_type));
+    shill_manager_client_.reset(ShillManagerClient::Create());
+    shill_device_client_.reset(ShillDeviceClient::Create());
+    shill_ipconfig_client_.reset(ShillIPConfigClient::Create());
+    shill_service_client_.reset(ShillServiceClient::Create());
+    shill_profile_client_.reset(ShillProfileClient::Create());
+    gsm_sms_client_.reset(GsmSMSClient::Create());
+    image_burner_client_.reset(ImageBurnerClient::Create());
     introspectable_client_.reset(IntrospectableClient::Create());
     modem_messaging_client_.reset(ModemMessagingClient::Create());
     // Create the NFC clients in the correct order based on their dependencies.
-    nfc_manager_client_.reset(NfcManagerClient::Create(client_type));
+    nfc_manager_client_.reset(NfcManagerClient::Create());
     nfc_adapter_client_.reset(
-        NfcAdapterClient::Create(client_type, nfc_manager_client_.get()));
+        NfcAdapterClient::Create(nfc_manager_client_.get()));
     nfc_device_client_.reset(
-        NfcDeviceClient::Create(client_type, nfc_adapter_client_.get()));
-    nfc_tag_client_.reset(
-        NfcTagClient::Create(client_type, nfc_adapter_client_.get()));
-    nfc_record_client_.reset(
-        NfcRecordClient::Create(
-            client_type, nfc_device_client_.get(), nfc_tag_client_.get()));
+        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()));
     permission_broker_client_.reset(PermissionBrokerClient::Create());
     power_manager_client_.reset(
         PowerManagerClient::Create(client_type_override));
     session_manager_client_.reset(SessionManagerClient::Create(client_type));
     sms_client_.reset(SMSClient::Create());
-    system_clock_client_.reset(SystemClockClient::Create(client_type));
+    system_clock_client_.reset(SystemClockClient::Create());
     update_engine_client_.reset(UpdateEngineClient::Create(client_type));
 
     power_policy_controller_.reset(new PowerPolicyController);