Added switch that let us 'un-stub' certain dbus clients.

chromeos/dbus/mixed_dbus_thread_manager.h

Index: chromeos/dbus/mixed_dbus_thread_manager.h
diff --git a/chromeos/dbus/mixed_dbus_thread_manager.h b/chromeos/dbus/mixed_dbus_thread_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..6be8e65faaa50edbae225729d96048908ce5f593
--- /dev/null
+++ b/chromeos/dbus/mixed_dbus_thread_manager.h
@@ -0,0 +1,90 @@
+// 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.
+
+#ifndef CHROMEOS_DBUS_MIXED_DBUS_THREAD_MANAGER_H_
+#define CHROMEOS_DBUS_MIXED_DBUS_THREAD_MANAGER_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_bundle.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+
+namespace chromeos {
+
+// This class permits mixing DBusThreadManagerImpl and FakeDBusThreadManager
+// implementation and allow us to selectively activate some dbus clients while
+// others remain stubbed out.
+class CHROMEOS_EXPORT MixedDBusThreadManager : public DBusThreadManager {

[hashimoto, 2014/08/08 07:08:44]

Instead of introducing MixedDBusThreadManager, can't we just use
FakeDBusThreadManager?
You can use SetAAAClient() methods to set real client implementations to
FakeDBusThreadManager.

[zel, 2014/08/08 19:00:15]

I am not sure about that. DBusThreadManagerImpl seems be doing way more stuff
than FakeDBusThreadManager. For example, it sets up and controls the lifetime of
the dbus thread. 

[hashimoto, 2014/08/11 11:01:05]

My primary concern here is that we have to maintain fragile <DBusClientType =>
each client> mapping in multiple places.
When developers want to change the mapping (e.g. adding a new value to
DBusClientType, changing how clients are grouped),
they have to carefully change DBusClientBundle's ctor and getters in
MixedDBusThreadManager (and Create() methods of bluetooth client classes),
otherwise the code gets completely broken.

Though it seems FakeDBusThreadManager cannot be used here as you said.
How about initializing clients with fakes in DBusClientBundle()'s ctor if
IsUsingStub() returns true?

+ public:
+  explicit MixedDBusThreadManager(unsigned int unstub_mask,
+                                  DBusThreadManager* real_thread_manager,
+                                  DBusThreadManager* fake_thread_manager);
+
+  virtual ~MixedDBusThreadManager();
+
+ private:
+
+  // DBusThreadManager overrides.
+  virtual void AddObserver(DBusThreadManagerObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(DBusThreadManagerObserver* observer) OVERRIDE;
+  virtual dbus::Bus* GetSystemBus() OVERRIDE;
+  virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE;
+  virtual BluetoothAgentManagerClient*
+      GetBluetoothAgentManagerClient() OVERRIDE;
+  virtual BluetoothDeviceClient* GetBluetoothDeviceClient() OVERRIDE;
+  virtual BluetoothGattCharacteristicClient*
+      GetBluetoothGattCharacteristicClient() OVERRIDE;
+  virtual BluetoothGattDescriptorClient*
+      GetBluetoothGattDescriptorClient() OVERRIDE;
+  virtual BluetoothGattManagerClient* GetBluetoothGattManagerClient() OVERRIDE;
+  virtual BluetoothGattServiceClient* GetBluetoothGattServiceClient() OVERRIDE;
+  virtual BluetoothInputClient* GetBluetoothInputClient() OVERRIDE;
+  virtual BluetoothProfileManagerClient*
+      GetBluetoothProfileManagerClient() OVERRIDE;
+  virtual CrasAudioClient* GetCrasAudioClient() OVERRIDE;
+  virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE;
+  virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE;
+  virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE;
+  virtual EasyUnlockClient* GetEasyUnlockClient() OVERRIDE;
+  virtual LorgnetteManagerClient* GetLorgnetteManagerClient() OVERRIDE;
+  virtual ShillDeviceClient* GetShillDeviceClient() OVERRIDE;
+  virtual ShillIPConfigClient* GetShillIPConfigClient() OVERRIDE;
+  virtual ShillManagerClient* GetShillManagerClient() OVERRIDE;
+  virtual ShillProfileClient* GetShillProfileClient() OVERRIDE;
+  virtual ShillServiceClient* GetShillServiceClient() OVERRIDE;
+  virtual GsmSMSClient* GetGsmSMSClient() OVERRIDE;
+  virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE;
+  virtual IntrospectableClient* GetIntrospectableClient() OVERRIDE;
+  virtual ModemMessagingClient* GetModemMessagingClient() OVERRIDE;
+  virtual NfcAdapterClient* GetNfcAdapterClient() OVERRIDE;
+  virtual NfcDeviceClient* GetNfcDeviceClient() OVERRIDE;
+  virtual NfcManagerClient* GetNfcManagerClient() OVERRIDE;
+  virtual NfcRecordClient* GetNfcRecordClient() OVERRIDE;
+  virtual NfcTagClient* GetNfcTagClient() OVERRIDE;
+  virtual PermissionBrokerClient* GetPermissionBrokerClient() OVERRIDE;
+  virtual PowerManagerClient* GetPowerManagerClient() OVERRIDE;
+  virtual PowerPolicyController* GetPowerPolicyController() OVERRIDE;
+  virtual SessionManagerClient* GetSessionManagerClient() OVERRIDE;
+  virtual SMSClient* GetSMSClient() OVERRIDE;
+  virtual SystemClockClient* GetSystemClockClient() OVERRIDE;
+  virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE;
+
+ private:
+  // Returns either the real or fake DBusThreadManager implementation based on
+  // |client| and |unstub_mask_|.
+  DBusThreadManager* GetThreadManager(DBusClientBundle::DBusClientType client);
+
+  // Bitmask that defines which dbus clients should use |real_thread_manager_|,
+  // all other will be served by |fake_thread_manager_|. Bitmap flags are
+  // defined within DBusClientBundle::DBusClientType enum.
+  unsigned int unstub_mask_;
+  scoped_ptr<DBusThreadManager> real_thread_manager_;
+  scoped_ptr<DBusThreadManager> fake_thread_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(MixedDBusThreadManager);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROMEOS_DBUS_MIXED_DBUS_THREAD_MANAGER_H_