| Index: device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.h
|
| diff --git a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.h
|
| similarity index 92%
|
| rename from chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h
|
| rename to device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.h
|
| index fe405c7670ed9811ac50d208c38caa665d86dc65..e933664a0a8c6818dca162c9199d56d67b3bf8fb 100644
|
| --- a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h
|
| +++ b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.h
|
| @@ -10,16 +10,16 @@
|
|
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| -#include "chromeos/chromeos_export.h"
|
| -#include "chromeos/dbus/bluetooth_gatt_descriptor_client.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_export.h"
|
| +#include "device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // FakeBluetoothGattDescriptorClient simulates the behavior of the Bluetooth
|
| // Daemon GATT characteristic descriptor objects and is used in test cases in
|
| // place of a mock and on the Linux desktop.
|
| -class CHROMEOS_EXPORT FakeBluetoothGattDescriptorClient
|
| +class DEVICE_BLUETOOTH_EXPORT FakeBluetoothGattDescriptorClient
|
| : public BluetoothGattDescriptorClient {
|
| public:
|
| struct Properties : public BluetoothGattDescriptorClient::Properties {
|
| @@ -93,12 +93,11 @@ class CHROMEOS_EXPORT FakeBluetoothGattDescriptorClient
|
| // 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<FakeBluetoothGattDescriptorClient>
|
| - weak_ptr_factory_;
|
| + base::WeakPtrFactory<FakeBluetoothGattDescriptorClient> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FakeBluetoothGattDescriptorClient);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| #endif // CHROMEOS_DBUS_FAKE_BLUETOOTH_GATT_DESCRIPTOR_CLIENT_H_
|
|
|