| Index: device/bluetooth/bluez/bluetooth_bluez_unittest.cc
|
| diff --git a/device/bluetooth/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
|
| similarity index 99%
|
| rename from device/bluetooth/bluetooth_bluez_unittest.cc
|
| rename to device/bluetooth/bluez/bluetooth_bluez_unittest.cc
|
| index 3ffca89a55b152e5dadbb615e6c919d5e637cd4b..c2f0fa1bb3b010df85dd0ba7fab1e6bd69a53261 100644
|
| --- a/device/bluetooth/bluetooth_bluez_unittest.cc
|
| +++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
|
| @@ -15,12 +15,12 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "dbus/object_path.h"
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| -#include "device/bluetooth/bluetooth_adapter_bluez.h"
|
| #include "device/bluetooth/bluetooth_adapter_factory.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
| -#include "device/bluetooth/bluetooth_device_bluez.h"
|
| #include "device/bluetooth/bluetooth_discovery_session.h"
|
| -#include "device/bluetooth/bluetooth_pairing_bluez.h"
|
| +#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
|
| +#include "device/bluetooth/bluez/bluetooth_device_bluez.h"
|
| +#include "device/bluetooth/bluez/bluetooth_pairing_bluez.h"
|
| #include "device/bluetooth/dbus/bluez_dbus_manager.h"
|
| #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h"
|
| #include "device/bluetooth/dbus/fake_bluetooth_agent_manager_client.h"
|
| @@ -2223,12 +2223,12 @@ TEST_F(BluetoothBlueZTest, DeviceAppearance) {
|
| bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
|
|
|
| // Let the device come without bluetooth_class.
|
| - properties->appearance.ReplaceValue(0); // DeviceChanged method called
|
| + properties->appearance.ReplaceValue(0); // DeviceChanged method called
|
| EXPECT_EQ(1, observer.device_changed_count());
|
| EXPECT_EQ(devices[idx], observer.last_device());
|
|
|
| // Set the device appearance as keyboard (961).
|
| - properties->appearance.ReplaceValue(961); // DeviceChanged method called
|
| + properties->appearance.ReplaceValue(961); // DeviceChanged method called
|
| properties->appearance.set_valid(true);
|
| EXPECT_EQ(2, observer.device_changed_count());
|
| EXPECT_EQ(devices[idx], observer.last_device());
|
| @@ -2239,11 +2239,11 @@ TEST_F(BluetoothBlueZTest, DeviceAppearance) {
|
| properties->NotifyPropertyChanged(properties->appearance.name());
|
| EXPECT_EQ(3, observer.device_changed_count());
|
| EXPECT_EQ(devices[idx], observer.last_device());
|
| - EXPECT_EQ((int) BluetoothDevice::kAppearanceNotPresent,
|
| + EXPECT_EQ((int)BluetoothDevice::kAppearanceNotPresent,
|
| devices[idx]->GetAppearance());
|
|
|
| // Change the device appearance to mouse (962).
|
| - properties->appearance.ReplaceValue(962); // DeviceChanged method called
|
| + properties->appearance.ReplaceValue(962); // DeviceChanged method called
|
| properties->appearance.set_valid(true);
|
| EXPECT_EQ(4, observer.device_changed_count());
|
| EXPECT_EQ(devices[idx], observer.last_device());
|
| @@ -2254,7 +2254,7 @@ TEST_F(BluetoothBlueZTest, DeviceAppearance) {
|
| properties->NotifyPropertyChanged(properties->appearance.name());
|
| EXPECT_EQ(5, observer.device_changed_count());
|
| EXPECT_EQ(devices[idx], observer.last_device());
|
| - EXPECT_EQ((int) BluetoothDevice::kAppearanceNotPresent,
|
| + EXPECT_EQ((int)BluetoothDevice::kAppearanceNotPresent,
|
| devices[idx]->GetAppearance());
|
| }
|
|
|
| @@ -2286,7 +2286,7 @@ TEST_F(BluetoothBlueZTest, DeviceTypebyAppearanceNotBluetoothClass) {
|
| EXPECT_EQ(devices[idx], observer.last_device());
|
|
|
| // Set the device appearance as keyboard.
|
| - properties->appearance.ReplaceValue(961); // DeviceChanged method called
|
| + properties->appearance.ReplaceValue(961); // DeviceChanged method called
|
| properties->appearance.set_valid(true);
|
| EXPECT_EQ(BluetoothDevice::DEVICE_KEYBOARD, devices[idx]->GetDeviceType());
|
| EXPECT_EQ(3, observer.device_changed_count());
|
| @@ -2300,7 +2300,7 @@ TEST_F(BluetoothBlueZTest, DeviceTypebyAppearanceNotBluetoothClass) {
|
| EXPECT_EQ(BluetoothDevice::DEVICE_UNKNOWN, devices[idx]->GetDeviceType());
|
|
|
| // Change the device appearance to mouse.
|
| - properties->appearance.ReplaceValue(962); // DeviceChanged method called
|
| + properties->appearance.ReplaceValue(962); // DeviceChanged method called
|
| properties->appearance.set_valid(true);
|
| EXPECT_EQ(BluetoothDevice::DEVICE_MOUSE, devices[idx]->GetDeviceType());
|
| EXPECT_EQ(5, observer.device_changed_count());
|
|
|