Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/fake_bluetooth_device_client.h

Index: device/bluetooth/dbus/fake_bluetooth_device_client.h
diff --git a/chromeos/dbus/fake_bluetooth_device_client.h b/device/bluetooth/dbus/fake_bluetooth_device_client.h
similarity index 83%
rename from chromeos/dbus/fake_bluetooth_device_client.h
rename to device/bluetooth/dbus/fake_bluetooth_device_client.h
index c19e965273e59784dd5380c3ea55bbc9c451f6b8..a883967e3ad1e87e8eb246c6a744fe2bfe915895 100644
--- a/chromeos/dbus/fake_bluetooth_device_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_device_client.h
@@ -13,22 +13,21 @@
 #include "base/containers/scoped_ptr_map.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
-#include "chromeos/dbus/bluetooth_agent_service_provider.h"
-#include "chromeos/dbus/bluetooth_device_client.h"
-#include "chromeos/dbus/bluetooth_profile_service_provider.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
+#include "device/bluetooth/dbus/bluetooth_agent_service_provider.h"
+#include "device/bluetooth/dbus/bluetooth_device_client.h"
+#include "device/bluetooth/dbus/bluetooth_profile_service_provider.h"
 
-namespace chromeos {
+namespace bluez {
 
 // FakeBluetoothDeviceClient simulates the behavior of the Bluetooth Daemon
 // device objects and is used both in test cases in place of a mock and on
 // the Linux desktop.
-class CHROMEOS_EXPORT FakeBluetoothDeviceClient
-    : public BluetoothDeviceClient {
+class CHROMEOS_EXPORT FakeBluetoothDeviceClient : public BluetoothDeviceClient {
  public:
   struct Properties : public BluetoothDeviceClient::Properties {
-    explicit Properties(const PropertyChangedCallback & callback);
+    explicit Properties(const PropertyChangedCallback& callback);
     ~Properties() override;
 
     // dbus::PropertySet override
@@ -237,52 +236,43 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient
   void DiscoverySimulationTimer();
   void IncomingPairingSimulationTimer();
 
-  void CompleteSimulatedPairing(
-      const dbus::ObjectPath& object_path,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback);
-  void TimeoutSimulatedPairing(
-      const dbus::ObjectPath& object_path,
-      const ErrorCallback& error_callback);
-  void CancelSimulatedPairing(
-      const dbus::ObjectPath& object_path,
-      const ErrorCallback& error_callback);
-  void RejectSimulatedPairing(
-      const dbus::ObjectPath& object_path,
-      const ErrorCallback& error_callback);
-  void FailSimulatedPairing(
-      const dbus::ObjectPath& object_path,
-      const ErrorCallback& error_callback);
-  void AddInputDeviceIfNeeded(
-      const dbus::ObjectPath& object_path,
-      Properties* properties);
+  void CompleteSimulatedPairing(const dbus::ObjectPath& object_path,
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback);
+  void TimeoutSimulatedPairing(const dbus::ObjectPath& object_path,
+                               const ErrorCallback& error_callback);
+  void CancelSimulatedPairing(const dbus::ObjectPath& object_path,
+                              const ErrorCallback& error_callback);
+  void RejectSimulatedPairing(const dbus::ObjectPath& object_path,
+                              const ErrorCallback& error_callback);
+  void FailSimulatedPairing(const dbus::ObjectPath& object_path,
+                            const ErrorCallback& error_callback);
+  void AddInputDeviceIfNeeded(const dbus::ObjectPath& object_path,
+                              Properties* properties);
 
   // Updates the inquiry RSSI property of fake device with object path
   // |object_path| to |rssi|, if the fake device exists.
   void UpdateDeviceRSSI(const dbus::ObjectPath& object_path, int16 rssi);
 
-  void PinCodeCallback(
-      const dbus::ObjectPath& object_path,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback,
-      BluetoothAgentServiceProvider::Delegate::Status status,
-      const std::string& pincode);
-  void PasskeyCallback(
-      const dbus::ObjectPath& object_path,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback,
-      BluetoothAgentServiceProvider::Delegate::Status status,
-      uint32 passkey);
+  void PinCodeCallback(const dbus::ObjectPath& object_path,
+                       const base::Closure& callback,
+                       const ErrorCallback& error_callback,
+                       BluetoothAgentServiceProvider::Delegate::Status status,
+                       const std::string& pincode);
+  void PasskeyCallback(const dbus::ObjectPath& object_path,
+                       const base::Closure& callback,
+                       const ErrorCallback& error_callback,
+                       BluetoothAgentServiceProvider::Delegate::Status status,
+                       uint32 passkey);
   void ConfirmationCallback(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
       BluetoothAgentServiceProvider::Delegate::Status status);
-  void SimulateKeypress(
-      uint16 entered,
-      const dbus::ObjectPath& object_path,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback);
+  void SimulateKeypress(uint16 entered,
+                        const dbus::ObjectPath& object_path,
+                        const base::Closure& callback,
+                        const ErrorCallback& error_callback);
 
   void ConnectionCallback(
       const dbus::ObjectPath& object_path,
@@ -320,6 +310,6 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient
   int16 max_transmit_power_;
 };
 
-}  // namespace chromeos
+}  // namespace bluez
 
 #endif  // CHROMEOS_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_