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"
@@ skipping 83 matching lines @@
   // |InitiailzeForTesting|.  The injected object will be owned by the
   // internal pointer and deleted by Shutdown().
   static void SetInstanceForTesting(DBusThreadManager* dbus_thread_manager);
 
   // Similar to Initialize(), but injects an alternative
   // DBusThreadManager using SetInstanceForTest first.  The injected
   // object will be owned by the internal pointer and deleted by
   // Shutdown(). Does not create any Fake client implementations.
   static void InitializeForTesting(DBusThreadManager* dbus_thread_manager);
 
+  // Initialize global thread manager instance.
+  static void InitializeRegular();

[hashimoto, 2014/08/08 02:06:16]

Do InitilizeRegular() and InitializeWithPartialStub() need to be public?
If not, please make them private.

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

Done.

+
   // Initialize with stub implementations for tests, creating a complete set
   // of fake/stub client implementations. Also initializes a default set of
   // fake Shill devices and services, customizable with switches::kShillStub.
   static void InitializeWithStub();
 
+  // 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);
+
   // 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();
 
@@ skipping 57 matching lines @@
 
   // Initializes |client| with the |system_bus_|.
   static void InitClient(DBusClient* client);
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_