bluetooth: Replace old advertised uuids

device/bluetooth/bluetooth_low_energy_device_mac.mm

 // Copyright 2015 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 "device/bluetooth/bluetooth_low_energy_device_mac.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 #include <stddef.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 43 matching lines @@
   ClearServiceData();
   NSDictionary* service_data =
       [advertisement_data objectForKey:CBAdvertisementDataServiceDataKey];
   for (CBUUID* uuid in service_data) {
     NSData* data = [service_data objectForKey:uuid];
     BluetoothUUID service_uuid =
         BluetoothAdapterMac::BluetoothUUIDWithCBUUID(uuid);
     SetServiceData(service_uuid, static_cast<const char*>([data bytes]),
                    [data length]);
   }
+
+  std::unordered_set<BluetoothUUID, BluetoothUUIDHash> uuid_set;
   NSArray* service_uuids =
       [advertisement_data objectForKey:CBAdvertisementDataServiceUUIDsKey];
   for (CBUUID* uuid in service_uuids) {
-    advertised_uuids_.insert(
-        BluetoothUUID(std::string([[uuid UUIDString] UTF8String])));
+    uuid_set.emplace([[uuid UUIDString] UTF8String]);
   }
   NSArray* overflow_service_uuids = [advertisement_data
       objectForKey:CBAdvertisementDataOverflowServiceUUIDsKey];
   for (CBUUID* uuid in overflow_service_uuids) {
-    advertised_uuids_.insert(
-        BluetoothUUID(std::string([[uuid UUIDString] UTF8String])));
+    uuid_set.emplace([[uuid UUIDString] UTF8String]);
   }
+
+  advertised_uuids_ = UUIDList(uuid_set.begin(), uuid_set.end());
 }
 
 std::string BluetoothLowEnergyDeviceMac::GetIdentifier() const {
   return identifier_;
 }
 
 uint32_t BluetoothLowEnergyDeviceMac::GetBluetoothClass() const {
   return 0x1F00;  // Unspecified Device Class
 }
 
@@ skipping 48 matching lines @@
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnectable() const {
   return connectable_;
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnecting() const {
   return ([peripheral_ state] == CBPeripheralStateConnecting);
 }
 
-BluetoothDevice::UUIDList BluetoothLowEnergyDeviceMac::GetUUIDs() const {
-  return BluetoothDevice::UUIDList(advertised_uuids_.begin(),
-                                   advertised_uuids_.end());
-}
-
 int16_t BluetoothLowEnergyDeviceMac::GetInquiryRSSI() const {
   return kUnknownPower;
 }
 
 int16_t BluetoothLowEnergyDeviceMac::GetInquiryTxPower() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
 
 bool BluetoothLowEnergyDeviceMac::ExpectingPinCode() const {
@@ skipping 125 matching lines @@
   // Notify when all services have been discovered.
   bool discovery_complete =
       std::find_if_not(
           gatt_services_.begin(), gatt_services_.end(),
           [](std::pair<std::string, BluetoothRemoteGattService*> pair) {
             BluetoothRemoteGattService* gatt_service = pair.second;
             return static_cast<BluetoothRemoteGattServiceMac*>(gatt_service)
                 ->IsDiscoveryComplete();
           }) == gatt_services_.end();
   if (discovery_complete) {
+    UpdateServiceUUIDs();
     SetGattServicesDiscoveryComplete(true);
     adapter_->NotifyGattServicesDiscovered(this);
   }
 }
 
 void BluetoothLowEnergyDeviceMac::DidModifyServices(
     NSArray* invalidatedServices) {
   for (CBService* cb_service in invalidatedServices) {
     BluetoothRemoteGattServiceMac* gatt_service =
         GetBluetoothRemoteGattService(cb_service);
     DCHECK(gatt_service);
     std::unique_ptr<BluetoothRemoteGattService> scoped_service =
         gatt_services_.take_and_erase(gatt_service->GetIdentifier());
     adapter_->NotifyGattServiceRemoved(scoped_service.get());
   }
+  service_uuids_.clear();
   SetGattServicesDiscoveryComplete(false);
   [GetPeripheral() discoverServices:nil];
 }
 
 void BluetoothLowEnergyDeviceMac::DidUpdateValue(
     CBCharacteristic* characteristic,
     NSError* error) {
   BluetoothRemoteGattServiceMac* gatt_service =
       GetBluetoothRemoteGattService(characteristic.service);
   DCHECK(gatt_service);
@@ skipping 68 matching lines @@
   GattServiceMap gatt_services_swapped;
   gatt_services_swapped.swap(gatt_services_);
   gatt_services_swapped.clear();
   if (create_gatt_connection_error_callbacks_.empty()) {
     // TODO(http://crbug.com/585897): Need to pass the error.
     DidDisconnectGatt();
   } else {
     DidFailToConnectGatt(error_code);
   }
 }