bluetooth: Refactor how we update based on Advertising Data

components/arc/bluetooth/arc_bluetooth_bridge.cc

 // Copyright 2016 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/arc/bluetooth/arc_bluetooth_bridge.h"
 
 #include <bluetooth/bluetooth.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 1454 matching lines @@
   }
   if (type == mojom::BluetoothPropertyType::ALL ||
       type == mojom::BluetoothPropertyType::BDADDR) {
     mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New();
     btp->set_bdaddr(mojom::BluetoothAddress::From(device->GetAddress()));
     properties.push_back(std::move(btp));
   }
   if (type == mojom::BluetoothPropertyType::ALL ||
       type == mojom::BluetoothPropertyType::UUIDS) {
     mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New();
-    std::vector<BluetoothUUID> uuids = device->GetUUIDs();
+    BluetoothDevice::UUIDSet uuids = device->GetUUIDs();
     mojo::Array<mojom::BluetoothUUIDPtr> uuid_results =
-        mojo::Array<mojom::BluetoothUUIDPtr>::New(0);
+        mojo::Array<mojom::BluetoothUUIDPtr>::New(uuids.size());
 
-    for (auto& uuid : uuids) {
-      uuid_results.push_back(mojom::BluetoothUUID::From(uuid));
+    size_t i = 0;
+    for (const auto& uuid : uuids) {

[Luis Héctor Chávez, 2016/08/23 15:49:27]

nit: can this be

for (size_t i = 0; i < uuids.size(); i++)
  uuid_results[i] = mojom::BluetoothUUID::From(uuids[i]);

? Same in L1640.

[ortuno, 2016/08/23 17:40:19]

We can't do that because uuids is not a vector, it's a set.

[Luis Héctor Chávez, 2016/08/23 17:44:28]

Fine then :(

+      uuid_results[i] = mojom::BluetoothUUID::From(uuid);
+      i++;
     }
 
     btp->set_uuids(std::move(uuid_results));
     properties.push_back(std::move(btp));
   }
   if (type == mojom::BluetoothPropertyType::ALL ||
       type == mojom::BluetoothPropertyType::CLASS_OF_DEVICE) {
     mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New();
     btp->set_device_class(device->GetBluetoothClass());
     properties.push_back(std::move(btp));
@@ skipping 132 matching lines @@
   mojo::Array<mojom::BluetoothAdvertisingDataPtr> advertising_data;
 
   // LocalName
   mojom::BluetoothAdvertisingDataPtr local_name =
       mojom::BluetoothAdvertisingData::New();
   local_name->set_local_name(device->GetName() ? device->GetName().value()
                                                : nullptr);
   advertising_data.push_back(std::move(local_name));
 
   // ServiceUuid
-  BluetoothDevice::UUIDList uuid_list = device->GetUUIDs();
-  if (uuid_list.size() > 0) {
+  BluetoothDevice::UUIDSet uuid_set = device->GetUUIDs();
+  if (uuid_set.size() > 0) {
     mojom::BluetoothAdvertisingDataPtr service_uuids_16 =
         mojom::BluetoothAdvertisingData::New();
-    mojo::Array<uint16_t> uuid16s;
-    for (auto& uuid : uuid_list) {
-      uuid16s.push_back(GetUUID16(uuid));
+    mojo::Array<uint16_t> uuid16s(uuid_set.size());
+    size_t i = 0;
+    for (const auto& uuid : uuid_set) {
+      uuid16s[i] = GetUUID16(uuid);
+      i++;
     }
     service_uuids_16->set_service_uuids_16(std::move(uuid16s));
     advertising_data.push_back(std::move(service_uuids_16));
   }
 
   // Service data
-  for (auto& uuid : device->GetServiceDataUUIDs()) {
-    base::BinaryValue* data = device->GetServiceData(uuid);
-    if (data->GetSize() == 0)
-      continue;
-    std::string data_str;
-    if (!data->GetAsString(&data_str))
-      continue;
-
+  for (const BluetoothUUID& uuid : device->GetServiceDataUUIDs()) {
     mojom::BluetoothAdvertisingDataPtr service_data_element =
         mojom::BluetoothAdvertisingData::New();
     mojom::BluetoothServiceDataPtr service_data =
         mojom::BluetoothServiceData::New();
 
     service_data->uuid_16bit = GetUUID16(uuid);
-    for (auto& c : data_str) {
-      service_data->data.push_back(c);
-    }
+
+    const std::vector<uint8_t>* data = device->GetServiceDataForUUID(uuid);
+    DCHECK(data != nullptr);
+
+    std::vector<uint8_t> data_copy = *data;
+    service_data->data.Swap(&data_copy);
+
     service_data_element->set_service_data(std::move(service_data));
     advertising_data.push_back(std::move(service_data_element));
   }
 
   return advertising_data;
 }
 
 void ArcBluetoothBridge::SendCachedDevicesFound() const {
   // Send devices that have already been discovered, but aren't connected.
   if (!HasBluetoothInstance())
@@ skipping 78 matching lines @@
   LOG(WARNING) << "Bluetooth instance is too old (version " << version
                << ") need version " << version_need;
   return false;
 }
 
 bool ArcBluetoothBridge::CalledOnValidThread() {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace arc