bluetooth: Replace old advertised uuids

device/bluetooth/bluetooth_adapter_unittest.cc

Index: device/bluetooth/bluetooth_adapter_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index a262e73d39763c656647d6829f5ecb55eaf2269f..42e141df6f58256e54d909d4794ebe6f16e190c1 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -647,8 +647,8 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDeviceWithUpdatedUUIDs) {
   EXPECT_EQ(1u, adapter_->GetDevices().size());
   EXPECT_EQ(device, observer.last_device());
 
-  // Expect new AND old UUIDs:
-  EXPECT_TRUE(
+  // Expect only new UUIDs:
+  EXPECT_FALSE(
       ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUIDGenericAccess)));
   EXPECT_TRUE(ContainsValue(device->GetUUIDs(),
                             BluetoothUUID(kTestUUIDImmediateAlert)));
@@ -657,16 +657,11 @@ TEST_F(BluetoothTest, DiscoverLowEnergyDeviceWithUpdatedUUIDs) {
   observer.Reset();
   SimulateLowEnergyDevice(3);
   EXPECT_EQ(0, observer.device_added_count());
-#if defined(OS_MACOSX)
-  // TODO(scheib): Call DeviceChanged only if UUIDs change. crbug.com/547106
   EXPECT_EQ(1, observer.device_changed_count());
-#else
-  EXPECT_EQ(0, observer.device_changed_count());
-#endif
   EXPECT_EQ(1u, adapter_->GetDevices().size());
 
-  // Expect all UUIDs:
-  EXPECT_EQ(4u, device->GetUUIDs().size());
+  // Expect no UUIDs:
+  EXPECT_EQ(0u, device->GetUUIDs().size());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)