Use new wrapper types for web_bluetooth.mojom

content/browser/bluetooth/bluetooth_metrics.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_metrics.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
@@ skipping 45 matching lines @@
 
 // requestDevice()
 
 void RecordRequestDeviceOutcome(UMARequestDeviceOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.Web.RequestDevice.Outcome",
                             static_cast<int>(outcome),
                             static_cast<int>(UMARequestDeviceOutcome::COUNT));
 }
 
 static void RecordRequestDeviceFilters(
-    const mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
+    const std::vector<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
   UMA_HISTOGRAM_COUNTS_100("Bluetooth.Web.RequestDevice.Filters.Count",
                            filters.size());
   for (const auto& filter : filters) {
+    if (!filter->services)
+      continue;
     UMA_HISTOGRAM_COUNTS_100("Bluetooth.Web.RequestDevice.FilterSize",
-                             filter->services.size());
-    for (const base::Optional<BluetoothUUID>& service : filter->services) {
+                             filter->services->size());
+    for (const BluetoothUUID& service : filter->services.value()) {
       // TODO(ortuno): Use a macro to histogram strings.
       // http://crbug.com/520284
       UMA_HISTOGRAM_SPARSE_SLOWLY(
           "Bluetooth.Web.RequestDevice.Filters.Services", HashUUID(service));
     }
   }
 }
 
 static void RecordRequestDeviceOptionalServices(
-    const mojo::Array<base::Optional<BluetoothUUID>>& optional_services) {
+    const std::vector<BluetoothUUID>& optional_services) {
   UMA_HISTOGRAM_COUNTS_100("Bluetooth.Web.RequestDevice.OptionalServices.Count",
                            optional_services.size());
-  for (const base::Optional<BluetoothUUID>& service : optional_services) {
+  for (const BluetoothUUID& service : optional_services) {
     // TODO(ortuno): Use a macro to histogram strings.
     // http://crbug.com/520284
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "Bluetooth.Web.RequestDevice.OptionalServices.Services",
         HashUUID(service));
   }
 }
 
 static void RecordUnionOfServices(
     const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options) {
   std::unordered_set<std::string> union_of_services;
-  for (const base::Optional<BluetoothUUID>& service :
-       options->optional_services) {
-    union_of_services.insert(service->canonical_value());
-  }
+  for (const BluetoothUUID& service : options->optional_services)
+    union_of_services.insert(service.canonical_value());
 
   for (const auto& filter : options->filters) {
-    for (const base::Optional<BluetoothUUID>& service : filter->services) {
-      union_of_services.insert(service->canonical_value());
-    }
+    if (!filter->services)
+      continue;
+    for (const BluetoothUUID& service : filter->services.value())
+      union_of_services.insert(service.canonical_value());
   }
 
   UMA_HISTOGRAM_COUNTS_100("Bluetooth.Web.RequestDevice.UnionOfServices.Count",
                            union_of_services.size());
 
   for (const std::string& service : union_of_services) {
     // TODO(ortuno): Use a macro to histogram strings.
     // http://crbug.com/520284
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "Bluetooth.Web.RequestDevice.UnionOfServices.Services",
@@ skipping 218 matching lines @@
 }
 
 void RecordRSSISignalStrengthLevel(UMARSSISignalStrengthLevel level) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.Web.RequestDevice.RSSISignalStrengthLevel",
       static_cast<int>(level),
       static_cast<int>(UMARSSISignalStrengthLevel::COUNT));
 }
 
 }  // namespace content