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

chromeos/dbus/dbus_client_bundle.h

 // Copyright 2014 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_CLIENT_BUNDLE_H_
 #define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/dbus_client_types.h"
 
 namespace chromeos {
 
 class ArcObbMounterClient;
 class CrasAudioClient;
 class CrosDisksClient;
 class CryptohomeClient;
 class DebugDaemonClient;
 class EasyUnlockClient;
 class GsmSMSClient;
@@ skipping 11 matching lines @@
 class ShillServiceClient;
 class ShillThirdPartyVpnDriverClient;
 class SystemClockClient;
 class UpdateEngineClient;
 
 // The bundle of all D-Bus clients used in DBusThreadManager. The bundle
 // is used to delete them at once in the right order before shutting down the
 // system bus. See also the comment in the destructor of DBusThreadManager.
 class CHROMEOS_EXPORT DBusClientBundle {
  public:
-  typedef int DBusClientTypeMask;
-
-  // TODO(zelidrag): We might want to collapse few more of these subsystems if
-  // their dbus interfaced correspond to the same daemon.
-  enum DBusClientType {
-    NO_CLIENT = 0,
-    BLUETOOTH = 1 << 0,
-    CRAS = 1 << 1,
-    CROS_DISKS = 1 << 2,
-    CRYPTOHOME = 1 << 3,
-    DEBUG_DAEMON = 1 << 4,
-    EASY_UNLOCK = 1 << 5,
-    LORGNETTE_MANAGER = 1 << 6,
-    SHILL = 1 << 7,
-    GSM_SMS = 1 << 8,
-    IMAGE_BURNER = 1 << 9,
-    MODEM_MESSAGING = 1 << 10,
-    PERMISSION_BROKER = 1 << 11,
-    POWER_MANAGER = 1 << 12,
-    SESSION_MANAGER = 1 << 13,
-    SMS = 1 << 14,
-    SYSTEM_CLOCK = 1 << 15,
-    UPDATE_ENGINE = 1 << 16,
-    ARC_OBB_MOUNTER = 1 << 17,
-  };
-
-  explicit DBusClientBundle(DBusClientTypeMask unstub_client_mask);
+  // Creates real implementations for |real_client_mask| and fakes for all
+  // others. Fakes are used when running on Linux desktop and in tests.
+  explicit DBusClientBundle(DBusClientTypeMask real_client_mask);
   ~DBusClientBundle();
 
-  // Returns true if |client| is stubbed.
-  bool IsUsingStub(DBusClientType client);
+  // Returns true if |client| has a real (non-fake) client implementation.
+  bool IsUsingReal(DBusClientType client) const;
 
   // Returns true if any real DBusClient is used.
-  bool IsUsingAnyRealClient();
+  bool IsUsingAnyRealClient() const;
 
   // Initialize proper runtime environment for its dbus clients.
   void SetupDefaultEnvironment();
 
-  // Parses command line param values for dbus subsystem that should be
-  // un-stubbed.
-  static DBusClientTypeMask ParseUnstubList(const std::string& unstub_list);
-
   ArcObbMounterClient* arc_obb_mounter_client() {
     return arc_obb_mounter_client_.get();
   }
 
   CrasAudioClient* cras_audio_client() {
     return cras_audio_client_.get();
   }
 
   CrosDisksClient* cros_disks_client() {
     return cros_disks_client_.get();
@@ skipping 71 matching lines @@
     return sms_client_.get();
   }
 
   UpdateEngineClient* update_engine_client() {
     return update_engine_client_.get();
   }
 
  private:
   friend class DBusThreadManagerSetter;
 
-  // Bitmask that defines which dbus clients are not stubbed out. Bitmap flags
-  // are defined within DBusClientType enum.
-  DBusClientTypeMask unstub_client_mask_;
+  // Bitmask for clients with real implementations.
+  const DBusClientTypeMask real_client_mask_;
 
   std::unique_ptr<ArcObbMounterClient> arc_obb_mounter_client_;
   std::unique_ptr<CrasAudioClient> cras_audio_client_;
   std::unique_ptr<CrosDisksClient> cros_disks_client_;
   std::unique_ptr<CryptohomeClient> cryptohome_client_;
   std::unique_ptr<DebugDaemonClient> debug_daemon_client_;
   std::unique_ptr<EasyUnlockClient> easy_unlock_client_;
   std::unique_ptr<LorgnetteManagerClient> lorgnette_manager_client_;
   std::unique_ptr<ShillDeviceClient> shill_device_client_;
   std::unique_ptr<ShillIPConfigClient> shill_ipconfig_client_;
@@ skipping 11 matching lines @@
   std::unique_ptr<SessionManagerClient> session_manager_client_;
   std::unique_ptr<SMSClient> sms_client_;
   std::unique_ptr<UpdateEngineClient> update_engine_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusClientBundle);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_