bluetooth: Refactor how we update based on Advertising Data

extensions/browser/api/bluetooth/bluetooth_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
@@ skipping 411 matching lines @@
       .WillRepeatedly(testing::Return(0x080104));
   EXPECT_CALL(*device1_, GetDeviceType())
       .WillRepeatedly(testing::Return(BluetoothDevice::DEVICE_COMPUTER));
   EXPECT_CALL(*device1_, GetVendorIDSource())
       .WillRepeatedly(testing::Return(BluetoothDevice::VENDOR_ID_BLUETOOTH));
   EXPECT_CALL(*device1_, GetVendorID()).WillRepeatedly(testing::Return(0x00E0));
   EXPECT_CALL(*device1_, GetProductID())
       .WillRepeatedly(testing::Return(0x240A));
   EXPECT_CALL(*device1_, GetDeviceID()).WillRepeatedly(testing::Return(0x0400));
 
-  BluetoothDevice::UUIDList uuids;
-  uuids.push_back(BluetoothUUID("1105"));
-  uuids.push_back(BluetoothUUID("1106"));
+  BluetoothDevice::UUIDSet uuids;
+  uuids.insert(BluetoothUUID("1105"));
+  uuids.insert(BluetoothUUID("1106"));
 
   EXPECT_CALL(*device1_, GetUUIDs()).WillOnce(testing::Return(uuids));
 
   devices.push_back(device1_.get());
 
   // Leave the second largely empty so we can check a device without
   // available information.
   devices.push_back(device2_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevices())
       .Times(1)
       .WillRepeatedly(testing::Return(devices));
 
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/device_info")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }