Use new wrapper types for web_bluetooth.mojom

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"
@@ skipping 68 matching lines @@
 
 bool BluetoothBlacklist::IsExcluded(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;
 }
 
 bool BluetoothBlacklist::IsExcluded(
-    const mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
+    const std::vector<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
   for (const blink::mojom::WebBluetoothScanFilterPtr& filter : filters) {
-    for (const base::Optional<BluetoothUUID>& service : filter->services) {
-      if (IsExcluded(service.value())) {
+    if (!filter->services)
+      continue;
+    for (const BluetoothUUID& service : filter->services.value()) {
+      if (IsExcluded(service))

[ortuno, 2016/11/22 02:32:20]

nit: In general, I would just keep the style (in this case brackets) if I don't
own the file since owners might prefer brackets. Most of Bluetooth code has
brackets so I would just leave them.

[juncai, 2016/11/23 20:54:22]

Done.

         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<base::Optional<BluetoothUUID>>
-      optional_services_blacklist_filtered;
-  for (const base::Optional<BluetoothUUID>& uuid : options->optional_services) {
-    if (!IsExcluded(uuid.value())) {
+  std::vector<device::BluetoothUUID> optional_services_blacklist_filtered;
+  for (const BluetoothUUID& uuid : options->optional_services) {
+    if (!IsExcluded(uuid))
       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