chromeos; Remove unused switch --dbus-unstub-clients / --dbus-real-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 <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chromeos/chromeos_export.h"
-#include "chromeos/dbus/dbus_client_types.h"
 
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace dbus {
 class Bus;
 class ObjectPath;
 }  // namespace dbus
 
@@ skipping 74 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 faked.
-  bool IsUsingFake(DBusClientType client);
+  // Returns true if clients are faked.
+  bool IsUsingFakes();
 
   // Returns various D-Bus bus instances, owned by DBusThreadManager.
   dbus::Bus* GetSystemBus();
 
   // All returned objects are owned by DBusThreadManager.  Do not use these
   // pointers after DBusThreadManager has been shut down.
   // TODO(jamescook): Replace this with calls to FooClient::Get().
   // http://crbug.com/647367
   ArcObbMounterClient* GetArcObbMounterClient();
   CrasAudioClient* GetCrasAudioClient();
@@ skipping 14 matching lines @@
   ShillServiceClient* GetShillServiceClient();
   ShillProfileClient* GetShillProfileClient();
   ShillThirdPartyVpnDriverClient* GetShillThirdPartyVpnDriverClient();
   SMSClient* GetSMSClient();
   SystemClockClient* GetSystemClockClient();
   UpdateEngineClient* GetUpdateEngineClient();
 
  private:
   friend class DBusThreadManagerSetter;
 
-  DBusThreadManager(ProcessMask process_mask,
-                    DBusClientTypeMask real_client_mask);
+  // Creates dbus clients for all process types in |process_mask|. Creates real
+  // clients if |use_real_clients| is set, otherwise creates fakes.
+  DBusThreadManager(ProcessMask process_mask, bool use_real_clients);
   ~DBusThreadManager();
 
-  // Creates a global instance of DBusThreadManager with the real
-  // implementations for all clients that are listed in |real_client_mask| and
-  // fake implementations for all clients that are not included. Cannot be
-  // called more than once.
-  static void CreateGlobalInstance(ProcessMask process_mask,
-                                   DBusClientTypeMask real_client_mask);
-
-  // Initialize global thread manager instance with all real dbus client
-  // implementations.
-  static void InitializeWithRealClients(ProcessMask process_mask);
-
-  // Initialize global thread manager instance with fake dbus clients.
-  static void InitializeWithFakeClients(ProcessMask process_mask);
-
-  // Initialize with fake implementations for only certain clients that are
-  // not included in the comma-separated |force_real_clients| list.
-  static void InitializeWithPartialFakes(ProcessMask process_mask,
-                                         const std::string& force_real_clients);
-
   // Initializes all currently stored DBusClients with the system bus and
   // performs additional setup.
   void InitializeClients();
 
   std::unique_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
 
+  // Whether to use real or fake dbus clients.
+  const bool use_real_clients_;
+
   // Clients used by multiple processes.
   std::unique_ptr<DBusClientsCommon> clients_common_;
 
   // Clients used only by the browser process. Null in other processes.
   std::unique_ptr<DBusClientsBrowser> clients_browser_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
 };
 
 // TODO(jamescook): Replace these with FooClient::InitializeForTesting().
@@ skipping 23 matching lines @@
   friend class DBusThreadManager;
 
   DBusThreadManagerSetter();
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManagerSetter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_