bluetooth: Refactor how we update based on Advertising Data

device/bluetooth/bluetooth_device_win.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 "device/bluetooth/bluetooth_device_win.h"
 
 #include <memory>
 #include <string>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 94 matching lines @@
 }
 
 bool BluetoothDeviceWin::IsConnectable() const {
   return false;
 }
 
 bool BluetoothDeviceWin::IsConnecting() const {
   return false;
 }
 
-BluetoothDevice::UUIDList BluetoothDeviceWin::GetUUIDs() const {
+BluetoothDevice::UUIDSet BluetoothDeviceWin::GetUUIDs() const {
   return uuids_;
 }
 
 base::Optional<int8_t> BluetoothDeviceWin::GetInquiryRSSI() const {
   // In windows, we can only get connected devices and connected
   // devices don't have an Inquiry RSSI.
   return base::nullopt;
 }
 
 base::Optional<int8_t> BluetoothDeviceWin::GetInquiryTxPower() const {
@@ skipping 100 matching lines @@
     const BluetoothTaskManagerWin::DeviceState& device_state) {
   if (address_ != device_state.address || name_ != device_state.name ||
       bluetooth_class_ != device_state.bluetooth_class ||
       visible_ != device_state.visible ||
       connected_ != device_state.connected ||
       paired_ != device_state.authenticated) {
     return false;
   }
 
   // Checks service collection
-  typedef std::set<BluetoothUUID> UUIDSet;
   typedef base::ScopedPtrHashMap<std::string,
                                  std::unique_ptr<BluetoothServiceRecordWin>>
       ServiceRecordMap;
 
-  UUIDSet known_services;
-  for (UUIDList::const_iterator iter = uuids_.begin(); iter != uuids_.end();
-       ++iter) {
-    known_services.insert((*iter));
-  }
+  UUIDSet known_services = uuids_;

[Jeffrey Yasskin, 2016/08/19 15:09:53]

Try not to make a copy here, if uuids_ doesn't change before you use
known_services.

[ortuno, 2016/08/19 20:50:33]

Done.

 
   UUIDSet new_services;
   ServiceRecordMap new_service_records;
   for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
            iter = device_state.service_record_states.begin();
        iter != device_state.service_record_states.end(); ++iter) {
     BluetoothServiceRecordWin* service_record = new BluetoothServiceRecordWin(
         address_, (*iter)->name, (*iter)->sdp_bytes, (*iter)->gatt_uuid);
     new_services.insert(service_record->uuid());
     new_service_records.set(
         service_record->uuid().canonical_value(),
         std::unique_ptr<BluetoothServiceRecordWin>(service_record));
   }
 
-  UUIDSet removed_services =
-      base::STLSetDifference<UUIDSet>(known_services, new_services);
-  if (!removed_services.empty()) {
-    return false;
-  }
-  UUIDSet added_devices =
-      base::STLSetDifference<UUIDSet>(new_services, known_services);
-  if (!added_devices.empty()) {
+  // Check that no new services have been added or removed.
+  if (known_services != new_services) {
     return false;
   }
 
   for (ServiceRecordList::const_iterator iter = service_record_list_.begin();
        iter != service_record_list_.end(); ++iter) {
     BluetoothServiceRecordWin* service_record = (*iter);
     BluetoothServiceRecordWin* new_service_record =
         new_service_records.get((*iter)->uuid().canonical_value());
     if (!service_record->IsEqual(*new_service_record))
       return false;
@@ skipping 35 matching lines @@
   uuids_.clear();
   service_record_list_.clear();
 
   for (ScopedVector<BluetoothTaskManagerWin::ServiceRecordState>::const_iterator
            iter = device_state.service_record_states.begin();
        iter != device_state.service_record_states.end(); ++iter) {
     BluetoothServiceRecordWin* service_record =
         new BluetoothServiceRecordWin(device_state.address, (*iter)->name,
                                       (*iter)->sdp_bytes, (*iter)->gatt_uuid);
     service_record_list_.push_back(service_record);
-    uuids_.push_back(service_record->uuid());
+    uuids_.insert(service_record->uuid());
   }
 
   if (!device_state.is_bluetooth_classic())
     UpdateGattServices(device_state.service_record_states);
 }
 
 bool BluetoothDeviceWin::IsGattServiceDiscovered(BluetoothUUID& uuid,
                                                  uint16_t attribute_handle) {
   GattServiceMap::iterator it = gatt_services_.begin();
   for (; it != gatt_services_.end(); it++) {
@@ skipping 63 matching lines @@
           primary_service->GetIdentifier(),
           std::unique_ptr<BluetoothRemoteGattService>(primary_service));
       adapter_->NotifyGattServiceAdded(primary_service);
     }
   }
 
   adapter_->NotifyGattServicesDiscovered(this);
 }
 
 }  // namespace device