bluetooth: Use BluetoothUUID instead of string when sending uuids

content/browser/bluetooth/bluetooth_blacklist.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 "content/browser/bluetooth/bluetooth_blacklist.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/optional.h"
 #include "base/strings/string_split.h"
 #include "content/public/browser/content_browser_client.h"
 
 using device::BluetoothUUID;
 
 namespace {
 
 static base::LazyInstance<content::BluetoothBlacklist>::Leaky g_singleton =
     LAZY_INSTANCE_INITIALIZER;
 
 void RecordUMAParsedNonEmptyString(bool success) {
   UMA_HISTOGRAM_BOOLEAN("Bluetooth.Web.Blacklist.ParsedNonEmptyString",
                         success);
 }
 
 }  // namespace
 
 namespace content {
 
 BluetoothBlacklist::~BluetoothBlacklist() {}
 
 // static
 BluetoothBlacklist& BluetoothBlacklist::Get() {
   return g_singleton.Get();
 }
 
-void BluetoothBlacklist::Add(const device::BluetoothUUID& uuid, Value value) {
+void BluetoothBlacklist::Add(const BluetoothUUID& uuid, Value value) {
   CHECK(uuid.IsValid());
   auto insert_result = blacklisted_uuids_.insert(std::make_pair(uuid, value));
   bool inserted = insert_result.second;
   if (!inserted) {
     Value& stored = insert_result.first->second;
     if (stored != value)
       stored = Value::EXCLUDE;
   }
 }
 
@@ skipping 34 matching lines @@
   CHECK(uuid.IsValid());
   const auto& it = blacklisted_uuids_.find(uuid);
   if (it == blacklisted_uuids_.end())
     return false;
   return it->second == Value::EXCLUDE;
 }
 
 bool BluetoothBlacklist::IsExcluded(
     const mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
   for (const blink::mojom::WebBluetoothScanFilterPtr& filter : filters) {
-    for (const std::string& service : filter->services) {
-      if (IsExcluded(BluetoothUUID(service))) {
+    for (const base::Optional<BluetoothUUID>& service : filter->services) {
+      if (IsExcluded(service.value())) {
         return true;
       }
     }
   }
   return false;
 }
 
 bool BluetoothBlacklist::IsExcludedFromReads(const BluetoothUUID& uuid) const {
   CHECK(uuid.IsValid());
   const auto& it = blacklisted_uuids_.find(uuid);
   if (it == blacklisted_uuids_.end())
     return false;
   return it->second == Value::EXCLUDE || it->second == Value::EXCLUDE_READS;
 }
 
 bool BluetoothBlacklist::IsExcludedFromWrites(const BluetoothUUID& uuid) const {
   CHECK(uuid.IsValid());
   const auto& it = blacklisted_uuids_.find(uuid);
   if (it == blacklisted_uuids_.end())
     return false;
   return it->second == Value::EXCLUDE || it->second == Value::EXCLUDE_WRITES;
 }
 
 void BluetoothBlacklist::RemoveExcludedUUIDs(
     blink::mojom::WebBluetoothRequestDeviceOptions* options) {
-  mojo::Array<mojo::String> optional_services_blacklist_filtered;
-  for (const std::string& uuid : options->optional_services) {
-    if (!IsExcluded(BluetoothUUID(uuid))) {
+  mojo::Array<base::Optional<BluetoothUUID>>
+      optional_services_blacklist_filtered;
+  for (const base::Optional<BluetoothUUID>& uuid : options->optional_services) {
+    if (!IsExcluded(uuid.value())) {
       optional_services_blacklist_filtered.push_back(uuid);
     }
   }
   options->optional_services = std::move(optional_services_blacklist_filtered);
 }
 
 void BluetoothBlacklist::ResetToDefaultValuesForTest() {
   blacklisted_uuids_.clear();
   PopulateWithDefaultValues();
   PopulateWithServerProvidedValues();
@@ skipping 46 matching lines @@
       Value::EXCLUDE_READS);
 }
 
 void BluetoothBlacklist::PopulateWithServerProvidedValues() {
   // DCHECK to maybe help debug https://crbug.com/604078.
   DCHECK(GetContentClient());
   Add(GetContentClient()->browser()->GetWebBluetoothBlacklist());
 }
 
 }  // namespace content