Index: device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h |
diff --git a/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h |
similarity index 96% |
rename from chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h |
rename to device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h |
index 8366169df529370e1914d9bfb59972451dd04ffe..dc5196d40a173c6220370d285977b5ca777e3efc 100644 |
--- a/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h |
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h |
@@ -12,17 +12,17 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/observer_list.h" |
-#include "chromeos/chromeos_export.h" |
-#include "chromeos/dbus/bluetooth_gatt_characteristic_client.h" |
#include "dbus/object_path.h" |
#include "dbus/property.h" |
+#include "device/bluetooth/bluetooth_export.h" |
+#include "device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h" |
-namespace chromeos { |
+namespace bluez { |
// FakeBluetoothGattCharacteristicClient simulates the behavior of the |
// Bluetooth Daemon GATT characteristic objects and is used in test cases in |
// place of a mock and on the Linux desktop. |
-class CHROMEOS_EXPORT FakeBluetoothGattCharacteristicClient |
+class DEVICE_BLUETOOTH_EXPORT FakeBluetoothGattCharacteristicClient |
: public BluetoothGattCharacteristicClient { |
public: |
struct Properties : public BluetoothGattCharacteristicClient::Properties { |
@@ -184,12 +184,11 @@ class CHROMEOS_EXPORT FakeBluetoothGattCharacteristicClient |
// than we do. |
// Note: This should remain the last member so it'll be destroyed and |
// invalidate its weak pointers before any other members are destroyed. |
- base::WeakPtrFactory<FakeBluetoothGattCharacteristicClient> |
- weak_ptr_factory_; |
+ base::WeakPtrFactory<FakeBluetoothGattCharacteristicClient> weak_ptr_factory_; |
DISALLOW_COPY_AND_ASSIGN(FakeBluetoothGattCharacteristicClient); |
}; |
-} // namespace chromeos |
+} // namespace bluez |
#endif // CHROMEOS_DBUS_FAKE_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_ |