Merged FakedDBusThreadManager with 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 61 matching lines @@
     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();
-  virtual ~DBusClientBundle();
+  ~DBusClientBundle();
 
   // 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 129 matching lines @@
 
   SMSClient* sms_client() {
     return sms_client_.get();
   }
 
   UpdateEngineClient* update_engine_client() {
     return update_engine_client_.get();
   }
 
  private:
+  friend class DBusThreadManager;
+  friend class DBusThreadManagerTestHelper;
+
+  DBusClientBundle();

[hashimoto, 2014/08/25 06:56:20]

Why do we need to change this ctor to private?
I think no one accidentally creates this object.

[zel, 2014/08/25 17:21:42]

I though you asked for something that in the previous review round... reverted
back to public.

+
   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_;
@@ skipping 25 matching lines @@
   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_