chromeos: Refactor D-Bus client type enum and stub vs. fake naming

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_bundle.h"
+#include "chromeos/dbus/dbus_client_types.h"
 
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace dbus {
 class Bus;
 class ObjectPath;
 }  // namespace dbus
 
 namespace chromeos {
 
 // Style Note: Clients are sorted by names.
 class ArcObbMounterClient;
 class CrasAudioClient;
 class CrosDisksClient;
 class CryptohomeClient;
+class DBusClientBundle;
 class DBusThreadManagerSetter;
 class DebugDaemonClient;
 class EasyUnlockClient;
 class GsmSMSClient;
 class ImageBurnerClient;
 class LorgnetteManagerClient;
 class ModemMessagingClient;
 class PermissionBrokerClient;
 class PowerManagerClient;
 class SMSClient;
@@ skipping 23 matching lines @@
 // the UI message loop won't post tasks to D-BUS clients during the
 // shutdown. However, to be extra cautious, clients should use
 // WeakPtrFactory when creating callbacks that run on UI thread. See
 // session_manager_client.cc for examples.
 //
 class CHROMEOS_EXPORT DBusThreadManager {
  public:
   // Sets the global instance. Must be called before any calls to Get().
   // We explicitly initialize and shut down the global object, rather than
   // making it a Singleton, to ensure clean startup and shutdown.
-  // This will initialize real or stub DBusClients depending on command-line
+  // This will initialize real or fake DBusClients depending on command-line
   // arguments and whether this process runs in a ChromeOS environment.
   static void Initialize();
 
   // Returns a DBusThreadManagerSetter instance that allows tests to
   // replace individual D-Bus clients with their own implementations.
   // Also initializes the main DBusThreadManager for testing if necessary.
   static std::unique_ptr<DBusThreadManagerSetter> GetSetterForTesting();
 
   // 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.
-  bool IsUsingStub(DBusClientBundle::DBusClientType client);
+  // Returns true if |client| is faked.
+  bool IsUsingFake(DBusClientType client);
 
   // 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.
   ArcObbMounterClient* GetArcObbMounterClient();
   CrasAudioClient* GetCrasAudioClient();
   CrosDisksClient* GetCrosDisksClient();
   CryptohomeClient* GetCryptohomeClient();
@@ skipping 18 matching lines @@
 
  private:
   friend class DBusThreadManagerSetter;
 
   // Creates a new DBusThreadManager using the DBusClients set in
   // |client_bundle|.
   explicit DBusThreadManager(std::unique_ptr<DBusClientBundle> client_bundle);
   ~DBusThreadManager();
 
   // Creates a global instance of DBusThreadManager with the real
-  // implementations for all clients that are listed in |unstub_client_mask| and
-  // stub implementations for all clients that are not included. Cannot be
+  // 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(
-      DBusClientBundle::DBusClientTypeMask unstub_client_mask);
+  static void CreateGlobalInstance(DBusClientTypeMask real_client_mask);
 
   // Initialize global thread manager instance with all real dbus client
   // implementations.
   static void InitializeWithRealClients();
 
-  // Initialize global thread manager instance with stubbed-out dbus clients
-  // implementation.
-  static void InitializeWithStubs();
+  // Initialize global thread manager instance with fake dbus clients.
+  static void InitializeWithFakeClients();
 
-  // Initialize with stub implementations for only certain clients that are
-  // not included in the comma-separated |unstub_clients| list.
-  static void InitializeWithPartialStub(const std::string& unstub_clients);
+  // Initialize with fake implementations for only certain clients that are
+  // not included in the comma-separated |force_real_clients| list.
+  static void InitializeWithPartialFakes(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_;
   std::unique_ptr<DBusClientBundle> client_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
@@ skipping 32 matching lines @@
   friend class DBusThreadManager;
 
   DBusThreadManagerSetter();
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManagerSetter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_