Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/dbus/dbus_client_bundle.h

Index: chromeos/dbus/dbus_client_bundle.h
diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h
index 9d5d22d855db6b9aa40d11c11d9a8340c01faf86..d71392c2e3cb2de70691a58f299d26b14cd5d7b0 100644
--- a/chromeos/dbus/dbus_client_bundle.h
+++ b/chromeos/dbus/dbus_client_bundle.h
@@ -79,8 +79,7 @@ class CHROMEOS_EXPORT DBusClientBundle {
     ALL_CLIENTS =          ~static_cast<DBusClientTypeMask>(0),
   };
 
-  DBusClientBundle();
-  virtual ~DBusClientBundle();
+  ~DBusClientBundle();
 
   // Initialize proper runtime environment for its dbus clients.
   void SetupDefaultEnvironment();
@@ -230,6 +229,11 @@ class CHROMEOS_EXPORT DBusClientBundle {
   }
 
  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_;