bluetooth: Refactor how we update based on Advertising Data

components/proximity_auth/ble/bluetooth_low_energy_connection_finder.cc

 // 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 "components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 154 matching lines @@
   // The device should be paired when looking for BLE devices by bluetooth
   // address.
   if (finder_strategy_ == FIND_PAIRED_DEVICE)
     return device->IsPaired() &&
            device->GetAddress() == remote_device_.bluetooth_address;
   return HasService(device);
 }
 
 bool BluetoothLowEnergyConnectionFinder::HasService(
     BluetoothDevice* remote_device) {
-  if (remote_device) {
-    PA_LOG(INFO) << "Device " << remote_device->GetAddress() << " has "
-                 << remote_device->GetUUIDs().size() << " services.";
-    std::vector<device::BluetoothUUID> uuids = remote_device->GetUUIDs();
-    for (const auto& service_uuid : uuids) {
-      if (remote_service_uuid_ == service_uuid) {
-        return true;
-      }
-    }
+  if (!remote_device) {
+    return false;
   }
-  return false;
+
+  BluetoothDevice::UUIDSet uuids = remote_device->GetUUIDs();
+
+  PA_LOG(INFO) << "Device " << remote_device->GetAddress() << " has "
+               << uuids.size() << " services.";
+  return base::ContainsKey(uuids, remote_service_uuid_);
 }
 
 void BluetoothLowEnergyConnectionFinder::OnAdapterInitialized(
     scoped_refptr<BluetoothAdapter> adapter) {
   PA_LOG(INFO) << "Adapter ready";
 
   adapter_ = adapter;
   adapter_->AddObserver(this);
 
   // This is important for debugging. To eliminate the case where the device was
@@ skipping 115 matching lines @@
       return device;
   }
   return nullptr;
 }
 
 void BluetoothLowEnergyConnectionFinder::InvokeCallbackAsync() {
   connection_callback_.Run(std::move(connection_));
 }
 
 }  // namespace proximity_auth