bluetooth: Refactor how we update based on Advertising Data

device/bluetooth/bluez/bluetooth_device_bluez.cc

 // Copyright 2013 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/bluez/bluetooth_device_bluez.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 329 matching lines @@
   if (!input_properties)
     return true;
 
   return input_properties->reconnect_mode.value() != "device";
 }
 
 bool BluetoothDeviceBlueZ::IsConnecting() const {
   return num_connecting_calls_ > 0;
 }
 
-BluetoothDeviceBlueZ::UUIDList BluetoothDeviceBlueZ::GetUUIDs() const {
+BluetoothDeviceBlueZ::UUIDSet BluetoothDeviceBlueZ::GetUUIDs() const {
   bluez::BluetoothDeviceClient::Properties* properties =
       bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->GetProperties(
           object_path_);
   DCHECK(properties);
 
-  std::vector<device::BluetoothUUID> uuids;
+  UUIDSet uuids;
   const std::vector<std::string>& dbus_uuids = properties->uuids.value();
-  for (std::vector<std::string>::const_iterator iter = dbus_uuids.begin();
-       iter != dbus_uuids.end(); ++iter) {
-    device::BluetoothUUID uuid(*iter);
+  for (const std::string& dbus_uuid : dbus_uuids) {
+    device::BluetoothUUID uuid(dbus_uuid);
     DCHECK(uuid.IsValid());
-    uuids.push_back(uuid);
+    uuids.insert(uuid);

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

Try to std::move() BluetoothUUIDs around, since they contain a string. It
doesn't help yet, but we can give BluetoothUUID a move constructor later.

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

Done.

   }
+
   return uuids;
 }
 
 base::Optional<int8_t> BluetoothDeviceBlueZ::GetInquiryRSSI() const {
   bluez::BluetoothDeviceClient::Properties* properties =
       bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->GetProperties(
           object_path_);
   DCHECK(properties);
 
   if (!properties->rssi.is_valid())
@@ skipping 516 matching lines @@
 void BluetoothDeviceBlueZ::OnForgetError(const ErrorCallback& error_callback,
                                          const std::string& error_name,
                                          const std::string& error_message) {
   LOG(WARNING) << object_path_.value()
                << ": Failed to remove device: " << error_name << ": "
                << error_message;
   error_callback.Run();
 }
 
 }  // namespace bluez