chromeos: Use FakeDBusThreadManager for --dbus-stub.

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"
@@ skipping 45 matching lines @@
 
 static DBusThreadManager* g_dbus_thread_manager = NULL;
 static DBusThreadManager* g_dbus_thread_manager_for_testing = NULL;
 
 // The bundle of all D-Bus clients used in DBusThreadManagerImpl. The bundle
 // is used to delete them at once in the right order before shutting down the
 // system bus. See also the comment in the destructor of DBusThreadManagerImpl.
 class DBusClientBundle {
  public:
   DBusClientBundle() {
-    DBusClientImplementationType client_type = REAL_DBUS_CLIENT_IMPLEMENTATION;
-    DBusClientImplementationType client_type_override = client_type;
-    // 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;
-    }
+    const DBusClientImplementationType type = REAL_DBUS_CLIENT_IMPLEMENTATION;
 
     bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create());
     bluetooth_agent_manager_client_.reset(
         BluetoothAgentManagerClient::Create());
     bluetooth_device_client_.reset(BluetoothDeviceClient::Create());
     bluetooth_gatt_characteristic_client_.reset(
         BluetoothGattCharacteristicClient::Create());
     bluetooth_gatt_descriptor_client_.reset(
         BluetoothGattDescriptorClient::Create());
     bluetooth_gatt_manager_client_.reset(BluetoothGattManagerClient::Create());
     bluetooth_gatt_service_client_.reset(BluetoothGattServiceClient::Create());
     bluetooth_input_client_.reset(BluetoothInputClient::Create());
     bluetooth_profile_manager_client_.reset(
         BluetoothProfileManagerClient::Create());
     cras_audio_client_.reset(CrasAudioClient::Create());
-    cros_disks_client_.reset(CrosDisksClient::Create(client_type));
+    cros_disks_client_.reset(CrosDisksClient::Create(type));
     cryptohome_client_.reset(CryptohomeClient::Create());
     debug_daemon_client_.reset(DebugDaemonClient::Create());
     lorgnette_manager_client_.reset(LorgnetteManagerClient::Create());
     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());
     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()));
     permission_broker_client_.reset(PermissionBrokerClient::Create());
-    power_manager_client_.reset(
-        PowerManagerClient::Create(client_type_override));
-    session_manager_client_.reset(SessionManagerClient::Create(client_type));
+    power_manager_client_.reset(PowerManagerClient::Create(type));
+    session_manager_client_.reset(SessionManagerClient::Create(type));
     sms_client_.reset(SMSClient::Create());
     system_clock_client_.reset(SystemClockClient::Create());
-    update_engine_client_.reset(UpdateEngineClient::Create(client_type));
+    update_engine_client_.reset(UpdateEngineClient::Create(type));
   }
 
   BluetoothAdapterClient* bluetooth_adapter_client() {
     return bluetooth_adapter_client_.get();
   }
   BluetoothAgentManagerClient* bluetooth_agent_manager_client() {
     return bluetooth_agent_manager_client_.get();
   }
   BluetoothDeviceClient* bluetooth_device_client() {
     return bluetooth_device_client_.get();
@@ skipping 354 matching lines @@
   // If we initialize DBusThreadManager twice we may also be shutting it down
   // early; do not allow that.
   CHECK(g_dbus_thread_manager == NULL);
 
   if (g_dbus_thread_manager_for_testing) {
     g_dbus_thread_manager = g_dbus_thread_manager_for_testing;
     InitializeClients();
     VLOG(1) << "DBusThreadManager initialized with test implementation";
     return;
   }
+
   // Determine whether we use stub or real client implementations.
-  if (base::SysInfo::IsRunningOnChromeOS()) {
+  if (!base::SysInfo::IsRunningOnChromeOS() ||
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kDbusStub)) {
+    InitializeWithStub();
+  } else {
     g_dbus_thread_manager = new DBusThreadManagerImpl;
     InitializeClients();
-    VLOG(1) << "DBusThreadManager initialized for ChromeOS";
-  } else {
-    InitializeWithStub();
+    VLOG(1) << "DBusThreadManager initialized for Chrome OS";
   }
 }
 
 // static
 void DBusThreadManager::SetInstanceForTesting(
     DBusThreadManager* dbus_thread_manager) {
   CHECK(!g_dbus_thread_manager);
   CHECK(!g_dbus_thread_manager_for_testing);
   g_dbus_thread_manager_for_testing = dbus_thread_manager;
 }
@@ skipping 115 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