Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h

Index: device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
diff --git a/chromeos/dbus/fake_bluetooth_gatt_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
similarity index 82%
rename from chromeos/dbus/fake_bluetooth_gatt_manager_client.h
rename to device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
index 9dccaac077ce441e6aca5a5def19c6992e530500..32209dfe41dd6b0aed2db170d653bc52fa65c2f2 100644
--- a/chromeos/dbus/fake_bluetooth_gatt_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
@@ -10,11 +10,11 @@
 #include <utility>
 
 #include "base/callback.h"
-#include "chromeos/chromeos_export.h"
-#include "chromeos/dbus/bluetooth_gatt_manager_client.h"
 #include "dbus/object_path.h"
+#include "device/bluetooth/bluetooth_export.h"
+#include "device/bluetooth/dbus/bluetooth_gatt_manager_client.h"
 
-namespace chromeos {
+namespace bluez {
 
 class FakeBluetoothGattCharacteristicServiceProvider;
 class FakeBluetoothGattDescriptorServiceProvider;
@@ -23,7 +23,7 @@ class FakeBluetoothGattServiceServiceProvider;
 // FakeBluetoothGattManagerClient simulates the behavior of the Bluetooth
 // daemon's GATT manager object and is used both in test cases in place of a
 // mock and on the Linux desktop.
-class CHROMEOS_EXPORT FakeBluetoothGattManagerClient
+class DEVICE_BLUETOOTH_EXPORT FakeBluetoothGattManagerClient
     : public BluetoothGattManagerClient {
  public:
   FakeBluetoothGattManagerClient();
@@ -60,13 +60,12 @@ class CHROMEOS_EXPORT FakeBluetoothGattManagerClient
 
   // Return a pointer to the service provider that corresponds to the object
   // path |object_path| if it exists.
-  FakeBluetoothGattServiceServiceProvider*
-      GetServiceServiceProvider(const dbus::ObjectPath& object_path) const;
+  FakeBluetoothGattServiceServiceProvider* GetServiceServiceProvider(
+      const dbus::ObjectPath& object_path) const;
   FakeBluetoothGattCharacteristicServiceProvider*
-      GetCharacteristicServiceProvider(
-          const dbus::ObjectPath& object_path) const;
-  FakeBluetoothGattDescriptorServiceProvider*
-      GetDescriptorServiceProvider(const dbus::ObjectPath& object_path) const;
+  GetCharacteristicServiceProvider(const dbus::ObjectPath& object_path) const;
+  FakeBluetoothGattDescriptorServiceProvider* GetDescriptorServiceProvider(
+      const dbus::ObjectPath& object_path) const;
 
   // Returns true, if a GATT service with object path |object_path| was
   // registered with the GATT manager using RegisterService.
@@ -76,12 +75,11 @@ class CHROMEOS_EXPORT FakeBluetoothGattManagerClient
   // Mappings for GATT service, characteristic, and descriptor service
   // providers. The fake GATT manager stores references to all instances
   // created so that they can be obtained by tests.
-  typedef std::map<
-      dbus::ObjectPath, FakeBluetoothGattCharacteristicServiceProvider*>
+  typedef std::map<dbus::ObjectPath,
+                   FakeBluetoothGattCharacteristicServiceProvider*>
       CharacteristicMap;
-  typedef std::map<
-      dbus::ObjectPath, FakeBluetoothGattDescriptorServiceProvider*>
-      DescriptorMap;
+  typedef std::map<dbus::ObjectPath,
+                   FakeBluetoothGattDescriptorServiceProvider*> DescriptorMap;
 
   // The mapping for services is from object paths to pairs of boolean and
   // service provider pointer, where the boolean denotes whether or not the
@@ -97,6 +95,6 @@ class CHROMEOS_EXPORT FakeBluetoothGattManagerClient
   DISALLOW_COPY_AND_ASSIGN(FakeBluetoothGattManagerClient);
 };
 
-}  // namespace chromeos
+}  // namespace bluez
 
 #endif  // CHROMEOS_DBUS_FAKE_BLUETOOTH_GATT_MANAGER_CLIENT_H_