Fix minor issues about DBusThreadManager.

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 "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 
@@ skipping 33 matching lines @@
 class PowerManagerClient;
 class SessionManagerClient;
 class SMSClient;
 class UpdateEngineClient;
 
 // The bundle of all D-Bus clients used in DBusThreadManagerImpl. 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 DBusThreadManagerImpl.
 class CHROMEOS_EXPORT DBusClientBundle {
  public:
-  typedef unsigned int DBusClientTypeMask;
+  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_CLIENTS =           0,
+    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,
     INTROSPECTABLE =       1 << 10,
     MODEM_MESSAGING =      1 << 11,
     NFC =                  1 << 12,
     PERMISSION_BROKER =    1 << 13,
     POWER_MANAGER =        1 << 14,
     SESSION_MANAGER =      1 << 15,
     SMS =                  1 << 16,
     SYSTEM_CLOCK =         1 << 17,
     UPDATE_ENGINE =        1 << 18,
-    ALL_CLIENTS =          ~static_cast<DBusClientTypeMask>(0),
   };
 
-  DBusClientBundle();
+  DBusClientBundle(DBusClientTypeMask unstub_client_mask);
   ~DBusClientBundle();
 
+  // Returns true if |client| is stubbed.
+  bool IsUsingStub(DBusClientType client);
+
+  // Returns true if any real DBusClient is used.
+  bool IsUsingAnyRealClient();
+
   // 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);
 
   BluetoothAdapterClient* bluetooth_adapter_client() {
     return bluetooth_adapter_client_.get();
   }
@@ skipping 130 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_;
+
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
   scoped_ptr<BluetoothGattCharacteristicClient>
       bluetooth_gatt_characteristic_client_;
   scoped_ptr<BluetoothGattDescriptorClient> bluetooth_gatt_descriptor_client_;
   scoped_ptr<BluetoothGattManagerClient> bluetooth_gatt_manager_client_;
   scoped_ptr<BluetoothGattServiceClient> bluetooth_gatt_service_client_;
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothProfileManagerClient> bluetooth_profile_manager_client_;
   scoped_ptr<CrasAudioClient> cras_audio_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debug_daemon_client_;
   scoped_ptr<EasyUnlockClient> easy_unlock_client_;
   scoped_ptr<LorgnetteManagerClient> lorgnette_manager_client_;
   scoped_ptr<ShillDeviceClient> shill_device_client_;
   scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
   scoped_ptr<ShillManagerClient> shill_manager_client_;
   scoped_ptr<ShillServiceClient> shill_service_client_;
   scoped_ptr<ShillProfileClient> shill_profile_client_;
   scoped_ptr<GsmSMSClient> gsm_sms_client_;
   scoped_ptr<ImageBurnerClient> image_burner_client_;
   scoped_ptr<IntrospectableClient> introspectable_client_;
   scoped_ptr<ModemMessagingClient> modem_messaging_client_;
   // The declaration order for NFC client objects is important. See
-  // DBusThreadManager::CreateDefaultClients for the dependencies.
+  // DBusThreadManager::InitializeClients for the dependencies.
   scoped_ptr<NfcManagerClient> nfc_manager_client_;
   scoped_ptr<NfcAdapterClient> nfc_adapter_client_;
   scoped_ptr<NfcDeviceClient> nfc_device_client_;
   scoped_ptr<NfcTagClient> nfc_tag_client_;
   scoped_ptr<NfcRecordClient> nfc_record_client_;
   scoped_ptr<PermissionBrokerClient> permission_broker_client_;
   scoped_ptr<SystemClockClient> system_clock_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusClientBundle);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_