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..e4710a86e36668ffcb764636ed5ebd01324c625a 100644
--- a/chromeos/dbus/dbus_client_bundle.h
+++ b/chromeos/dbus/dbus_client_bundle.h
@@ -80,7 +80,7 @@ class CHROMEOS_EXPORT DBusClientBundle {
   };
 
   DBusClientBundle();
-  virtual ~DBusClientBundle();
+  ~DBusClientBundle();
 
   // Initialize proper runtime environment for its dbus clients.
   void SetupDefaultEnvironment();
@@ -230,6 +230,8 @@ class CHROMEOS_EXPORT DBusClientBundle {
   }
 
  private:
+  friend class DBusThreadManagerSetter;
+
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;