bluetooth: Refactor how we update based on Advertising Data

device/bluetooth/bluetooth_device_win_unittest.cc

Index: device/bluetooth/bluetooth_device_win_unittest.cc
diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc
index 5e6bd24ed549c66e9eab1bcf24a55290ebde799d..75bfaebc5722fc69aa8577e9faceae6e5dc82e33 100644
--- a/device/bluetooth/bluetooth_device_win_unittest.cc
+++ b/device/bluetooth/bluetooth_device_win_unittest.cc
@@ -85,11 +85,11 @@ class BluetoothDeviceWinTest : public testing::Test {
 };
 
 TEST_F(BluetoothDeviceWinTest, GetUUIDs) {
-  BluetoothDevice::UUIDList uuids = device_->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = device_->GetUUIDs();
 
   EXPECT_EQ(2u, uuids.size());
-  EXPECT_EQ(kTestAudioSdpUuid, uuids[0]);
-  EXPECT_EQ(kTestVideoSdpUuid, uuids[1]);
+  EXPECT_TRUE(base::ContainsKey(uuids, kTestAudioSdpUuid));
+  EXPECT_TRUE(base::ContainsKey(uuids, kTestVideoSdpUuid));
 
   uuids = empty_device_->GetUUIDs();
   EXPECT_EQ(0u, uuids.size());