Index: device/bluetooth/bluetooth_adapter_unittest.cc |
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc |
index 5a412aa14cc18ecab256922740e7b4aec628dbfd..054ff1444d3280c1e7072976ee971d4123575649 100644 |
--- a/device/bluetooth/bluetooth_adapter_unittest.cc |
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc |
@@ -895,9 +895,11 @@ TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithNoFilter) { |
EXPECT_EQ(2, observer.device_added_count()); |
EXPECT_EQ(2u, adapter_->GetDevices().size()); |
} |
+#endif // defined(OS_MACOSX) |
ortuno
2017/05/04 01:11:49
I'm OK with this change here but could you update
jlebel
2017/05/04 16:38:49
Done.
jlebel
2017/05/04 16:50:31
crrev.com/2863643003
|
// Simulate two devices being connected before calling |
// RetrieveGattConnectedDevicesWithDiscoveryFilter() with one service filter. |
+#if defined(OS_MACOSX) |
TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithFilter) { |
if (!PlatformSupportsLowEnergy()) { |
LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
@@ -927,10 +929,12 @@ TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithFilter) { |
EXPECT_EQ(1, observer.device_added_count()); |
EXPECT_EQ(1u, adapter_->GetDevices().size()); |
} |
+#endif // defined(OS_MACOSX) |
// Simulate two devices being connected before calling |
// RetrieveGattConnectedDevicesWithDiscoveryFilter() with one service filter |
// that doesn't match. |
+#if defined(OS_MACOSX) |
TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithWrongFilter) { |
if (!PlatformSupportsLowEnergy()) { |
LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
@@ -954,10 +958,12 @@ TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithWrongFilter) { |
EXPECT_EQ(0, observer.device_added_count()); |
EXPECT_EQ(0u, adapter_->GetDevices().size()); |
} |
+#endif // defined(OS_MACOSX) |
// Simulate two devices being connected before calling |
// RetrieveGattConnectedDevicesWithDiscoveryFilter() with two service filters |
// that both match. |
+#if defined(OS_MACOSX) |
TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithTwoFilters) { |
if (!PlatformSupportsLowEnergy()) { |
LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
@@ -999,11 +1005,13 @@ TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceWithTwoFilters) { |
EXPECT_EQ(2, observer.device_added_count()); |
EXPECT_EQ(2u, adapter_->GetDevices().size()); |
} |
+#endif // defined(OS_MACOSX) |
// Simulate two devices being connected before calling |
// RetrieveGattConnectedDevicesWithDiscoveryFilter() with one service filter |
// that one match device, and then |
// RetrieveGattConnectedDevicesWithDiscoveryFilter() again. |
+#if defined(OS_MACOSX) |
TEST_F(BluetoothTest, DiscoverConnectedLowEnergyDeviceTwice) { |
if (!PlatformSupportsLowEnergy()) { |
LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |