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

chromeos/dbus/dbus_thread_manager.cc

 // Copyright (c) 2012 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_thread_manager.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/sys_info.h"
 #include "base/threading/thread.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"
 #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/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"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/nfc_adapter_client.h"
 #include "chromeos/dbus/nfc_device_client.h"
 #include "chromeos/dbus/nfc_manager_client.h"
@@ skipping 183 matching lines @@
 
   virtual SystemClockClient* GetSystemClockClient() OVERRIDE {
     return system_clock_client_.get();
   }
 
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
     return update_engine_client_.get();
   }
 
  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 =
         REAL_DBUS_CLIENT_IMPLEMENTATION;
     // If --dbus-stub was requested, pass STUB to specific components;
     // Many components like login are not useful with a stub implementation.
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             chromeos::switches::kDbusStub)) {
       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);
   }
 
   // Note: Keep this before other members so they can call AddObserver() in
   // their c'tors.
   ObserverList<DBusThreadManagerObserver> observers_;
 
   scoped_ptr<base::Thread> dbus_thread_;
@@ skipping 166 matching lines @@
     g_dbus_thread_manager->GetSystemBus()->GetManagedObjects();
 }
 
 // static
 void DBusThreadManager::InitClient(DBusClient* client) {
   if (client)
     client->Init(g_dbus_thread_manager->GetSystemBus());
 }
 
 }  // namespace chromeos