| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "device/bluetooth/test/bluetooth_test_bluez.h" | 5 #include "device/bluetooth/test/bluetooth_test_bluez.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "device/bluetooth/bluetooth_adapter_bluez.h" | 12 #include "device/bluetooth/bluez/bluetooth_adapter_bluez.h" |
| 13 #include "device/bluetooth/bluetooth_device_bluez.h" | 13 #include "device/bluetooth/bluez/bluetooth_device_bluez.h" |
| 14 #include "device/bluetooth/bluetooth_gatt_descriptor_bluez.h" | 14 #include "device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h" |
| 15 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h" | 15 #include "device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h" |
| 16 #include "device/bluetooth/bluetooth_remote_gatt_service_bluez.h" | 16 #include "device/bluetooth/bluez/bluetooth_remote_gatt_service_bluez.h" |
| 17 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 17 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
| 18 #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h" | 18 #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h" |
| 19 #include "device/bluetooth/dbus/fake_bluetooth_device_client.h" | 19 #include "device/bluetooth/dbus/fake_bluetooth_device_client.h" |
| 20 #include "device/bluetooth/test/test_bluetooth_adapter_observer.h" | 20 #include "device/bluetooth/test/test_bluetooth_adapter_observer.h" |
| 21 | 21 |
| 22 namespace device { | 22 namespace device { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 void AdapterCallback(base::Closure quit_closure) { | 26 void AdapterCallback(base::Closure quit_closure) { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 fake_bluetooth_device_client_->CreateTestDevice( | 94 fake_bluetooth_device_client_->CreateTestDevice( |
| 95 dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath), | 95 dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath), |
| 96 device_name /* name */, device_name /* alias */, device_address, | 96 device_name /* name */, device_name /* alias */, device_address, |
| 97 service_uuids); | 97 service_uuids); |
| 98 } | 98 } |
| 99 BluetoothDevice* device = adapter_->GetDevice(device_address); | 99 BluetoothDevice* device = adapter_->GetDevice(device_address); |
| 100 | 100 |
| 101 return device; | 101 return device; |
| 102 } | 102 } |
| 103 } | 103 } |
| OLD | NEW |