Index: device/bluetooth/bluez/bluetooth_device_bluez.cc |
diff --git a/device/bluetooth/bluetooth_device_bluez.cc b/device/bluetooth/bluez/bluetooth_device_bluez.cc |
similarity index 98% |
rename from device/bluetooth/bluetooth_device_bluez.cc |
rename to device/bluetooth/bluez/bluetooth_device_bluez.cc |
index 6fb385273a027d6ecc2940a62078ea6028c1ff78..73e54871143c0599a4789e551dcd622dbde82343 100644 |
--- a/device/bluetooth/bluetooth_device_bluez.cc |
+++ b/device/bluetooth/bluez/bluetooth_device_bluez.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "device/bluetooth/bluetooth_device_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_device_bluez.h" |
#include <stdio.h> |
@@ -14,14 +14,14 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
#include "dbus/bus.h" |
-#include "device/bluetooth/bluetooth_adapter_bluez.h" |
-#include "device/bluetooth/bluetooth_gatt_connection_bluez.h" |
-#include "device/bluetooth/bluetooth_pairing_bluez.h" |
-#include "device/bluetooth/bluetooth_remote_gatt_service_bluez.h" |
#include "device/bluetooth/bluetooth_socket.h" |
-#include "device/bluetooth/bluetooth_socket_bluez.h" |
#include "device/bluetooth/bluetooth_socket_thread.h" |
#include "device/bluetooth/bluetooth_uuid.h" |
+#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_gatt_connection_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_pairing_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_remote_gatt_service_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_socket_bluez.h" |
#include "device/bluetooth/dbus/bluetooth_adapter_client.h" |
#include "device/bluetooth/dbus/bluetooth_device_client.h" |
#include "device/bluetooth/dbus/bluetooth_gatt_service_client.h" |
@@ -30,7 +30,7 @@ |
#include "third_party/cros_system_api/dbus/service_constants.h" |
using device::BluetoothDevice; |
-using device::BluetoothGattService; |
+using device::BluetoothRemoteGattService; |
using device::BluetoothSocket; |
using device::BluetoothUUID; |
@@ -562,7 +562,7 @@ void BluetoothDeviceBlueZ::GattServiceAdded( |
new BluetoothRemoteGattServiceBlueZ(adapter(), this, object_path); |
gatt_services_.set(service->GetIdentifier(), |
- std::unique_ptr<BluetoothGattService>(service)); |
+ std::unique_ptr<BluetoothRemoteGattService>(service)); |
DCHECK(service->object_path() == object_path); |
DCHECK(service->GetUUID().IsValid()); |
@@ -587,7 +587,7 @@ void BluetoothDeviceBlueZ::GattServiceRemoved( |
<< "' from device: " << GetAddress(); |
DCHECK(service->object_path() == object_path); |
- std::unique_ptr<BluetoothGattService> scoped_service = |
+ std::unique_ptr<BluetoothRemoteGattService> scoped_service = |
gatt_services_.take_and_erase(iter->first); |
DCHECK(adapter_); |