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

chromeos/dbus/dbus_thread_manager.h

 // 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_DBUS_THREAD_MANAGER_H_
 #define CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_bundle.h"
 
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace dbus {
 class Bus;
 class ObjectPath;
 }  // namespace dbus
 
@@ skipping 85 matching lines @@
   // Returns true if DBusThreadManager has been initialized. Call this to
   // avoid initializing + shutting down DBusThreadManager more than once.
   static bool IsInitialized();
 
   // Destroys the global instance.
   static void Shutdown();
 
   // Gets the global instance. Initialize() must be called first.
   static DBusThreadManager* Get();
 
+  // Returns true if |client| is stubbed.
+  static bool IsUsingStub(DBusClientBundle::DBusClientType client);
+
   // Returns various D-Bus bus instances, owned by DBusThreadManager.
   virtual dbus::Bus* GetSystemBus() = 0;
 
   // All returned objects are owned by DBusThreadManager.  Do not cache these
   // pointers and use them after DBusThreadManager has been shut down.
   virtual BluetoothAdapterClient* GetBluetoothAdapterClient() = 0;
   virtual BluetoothAgentManagerClient* GetBluetoothAgentManagerClient() = 0;
   virtual BluetoothDeviceClient* GetBluetoothDeviceClient() = 0;
   virtual BluetoothGattCharacteristicClient*
       GetBluetoothGattCharacteristicClient() = 0;
@@ skipping 29 matching lines @@
   virtual SMSClient* GetSMSClient() = 0;
   virtual SystemClockClient* GetSystemClockClient() = 0;
   virtual UpdateEngineClient* GetUpdateEngineClient() = 0;
 
   virtual ~DBusThreadManager();
 
  protected:
   DBusThreadManager();
 
  private:
+  // Initialize global thread manager instance.
+  static void InitializeRegular();
+
+  // Initialize with stub implementations for only certain clients that are
+  // not included in comma-separated |unstub_clients| list.
+  static void InitializeWithPartialStub(const std::string& unstub_clients);
+
   // InitializeClients is called after g_dbus_thread_manager is set.
   // NOTE: Clients that access other clients in their Init() must be
   // initialized in the correct order.
   static void InitializeClients();
 
   // Initializes |client| with the |system_bus_|.
   static void InitClient(DBusClient* client);
 
+  // Bitmask that defines which dbus clients are not stubbed out. Bitmap flags
+  // are defined within DBusClientBundle::DBusClientType enum.
+  static DBusClientBundle::DBusClientTypeMask unstub_client_mask_;
+
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_