bluetooth: Use BluetoothUUID instead of string when sending uuids

content/browser/bluetooth/bluetooth_allowed_devices_map.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 "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 111 matching lines @@
 
   auto id_iter = device_id_to_address_map.find(device_id);
 
   return id_iter == device_id_to_address_map.end() ? base::EmptyString()
                                                    : id_iter->second;
 }
 
 bool BluetoothAllowedDevicesMap::IsOriginAllowedToAccessService(
     const url::Origin& origin,
     const std::string& device_id,
-    const std::string& service_uuid) const {
-  if (BluetoothBlacklist::Get().IsExcluded(BluetoothUUID(service_uuid))) {
+    const BluetoothUUID& service_uuid) const {
+  if (BluetoothBlacklist::Get().IsExcluded(service_uuid)) {
     return false;
   }
 
   auto id_map_iter = origin_to_device_id_to_services_map_.find(origin);
   if (id_map_iter == origin_to_device_id_to_services_map_.end()) {
     return false;
   }
 
   const auto& device_id_to_services_map = id_map_iter->second;
 
   auto id_iter = device_id_to_services_map.find(device_id);
 
   return id_iter == device_id_to_services_map.end()
              ? false
              : ContainsKey(id_iter->second, service_uuid);
 }
 
 std::string BluetoothAllowedDevicesMap::GenerateDeviceId() {
   std::string device_id = GetBase64Id();
   while (ContainsKey(device_id_set_, device_id)) {
     LOG(WARNING) << "Generated repeated id.";
     device_id = GetBase64Id();
   }
   return device_id;
 }
 
 void BluetoothAllowedDevicesMap::AddUnionOfServicesTo(
     const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options,
-    std::set<std::string>* unionOfServices) {
+    std::set<BluetoothUUID>* unionOfServices) {
   for (const auto& filter : options->filters) {
-    for (const std::string& uuid : filter->services) {
-      unionOfServices->insert(uuid);
+    for (const std::unique_ptr<BluetoothUUID>& uuid : filter->services) {

[Jeffrey Yasskin, 2016/05/28 04:38:06]

I'm definitely sad that there's no type-based way to say that these UUIDs will
never be null. We can wait until Ken's general solution though.

[ortuno, 2016/05/31 17:30:47]

I'm OK with waiting.

+      unionOfServices->insert(*uuid);
     }
   }
-  for (const std::string& uuid : options->optional_services) {
-    unionOfServices->insert(uuid);
+  for (const std::unique_ptr<BluetoothUUID>& uuid :
+       options->optional_services) {
+    unionOfServices->insert(*uuid);
   }
 }
 
 }  // namespace content