Chromium Code Reviews| Index: device/bluetooth/bluetooth_adapter_unittest.cc |
| diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc |
| index ae34e637032c7b6829aef581b94c0a727c393e54..9e5c6784186cc10f539baece7f787599ab72d568 100644 |
| --- a/device/bluetooth/bluetooth_adapter_unittest.cc |
| +++ b/device/bluetooth/bluetooth_adapter_unittest.cc |
| @@ -26,6 +26,8 @@ |
| #include "device/bluetooth/test/bluetooth_test_mac.h" |
| #elif defined(OS_WIN) |
| #include "device/bluetooth/test/bluetooth_test_win.h" |
| +#elif defined(OS_CHROMEOS) || defined(OS_LINUX) |
| +#include "device/bluetooth/test/bluetooth_test_bluez.h" |
| #endif |
| using device::BluetoothDevice; |
| @@ -418,7 +420,6 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterAllFields) { |
| } |
| // TODO(scheib): Enable BluetoothTest fixture tests on all platforms. |
| -#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| TEST_F(BluetoothTest, ConstructDefaultAdapter) { |
| InitWithDefaultAdapter(); |
|
scheib
2016/04/15 19:44:44
Skip brining up this test, see below...
rkc
2016/04/15 20:26:06
Done.
|
| if (!adapter_->IsPresent()) { |
| @@ -434,7 +435,6 @@ TEST_F(BluetoothTest, ConstructDefaultAdapter) { |
| EXPECT_FALSE(adapter_->IsDiscoverable()); |
| EXPECT_FALSE(adapter_->IsDiscovering()); |
| } |
| -#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // TODO(scheib): Enable BluetoothTest fixture tests on all platforms. |
| #if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| @@ -547,7 +547,6 @@ TEST_F(BluetoothTest, NoPermissions) { |
| } |
| #endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // Discovers a device. |
| TEST_F(BluetoothTest, DiscoverLowEnergyDevice) { |
| if (!PlatformSupportsLowEnergy()) { |
| @@ -564,9 +563,7 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDevice) { |
| BluetoothDevice* device = adapter_->GetDevice(observer.last_device_address()); |
| EXPECT_TRUE(device); |
| } |
| -#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| -#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // Discovers the same device multiple times. |
| TEST_F(BluetoothTest, DiscoverLowEnergyDeviceTwice) { |
| if (!PlatformSupportsLowEnergy()) { |
| @@ -590,7 +587,6 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDeviceTwice) { |
| EXPECT_EQ(0, observer.device_added_count()); |
| EXPECT_EQ(1u, adapter_->GetDevices().size()); |
| } |
| -#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| #if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Discovers a device, and then again with new Service UUIDs. |
| @@ -643,7 +639,6 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDeviceWithUpdatedUUIDs) { |
| } |
| #endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // Discovers multiple devices when addresses vary. |
| TEST_F(BluetoothTest, DiscoverMultipleLowEnergyDevices) { |
| if (!PlatformSupportsLowEnergy()) { |
| @@ -660,7 +655,6 @@ TEST_F(BluetoothTest, DiscoverMultipleLowEnergyDevices) { |
| EXPECT_EQ(2, observer.device_added_count()); |
| EXPECT_EQ(2u, adapter_->GetDevices().size()); |
| } |
| -#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| #if defined(OS_ANDROID) |
| TEST_F(BluetoothTest, TogglePowerFakeAdapter) { |