Add RemoteGATTDescriptor to WebBluetoothFunction histogram enum.

content/browser/bluetooth/web_bluetooth_service_impl.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.
 
 // ID Not In Map Note: A service, characteristic, or descriptor ID not in the
 // corresponding WebBluetoothServiceImpl map [service_id_to_device_address_,
 // characteristic_id_to_service_id_, descriptor_id_to_characteristic_id_]
 // implies a hostile renderer because a renderer obtains the corresponding ID
 // from this class and it will be added to the map at that time.
 
@@ skipping 510 matching lines @@
                    : blink::mojom::WebBluetoothResult::NO_CHARACTERISTICS_FOUND,
                base::nullopt /* characteristics */);
 }
 
 void WebBluetoothServiceImpl::RemoteCharacteristicGetDescriptors(
     const std::string& characteristic_instance_id,
     blink::mojom::WebBluetoothGATTQueryQuantity quantity,
     const base::Optional<BluetoothUUID>& descriptors_uuid,
     const RemoteCharacteristicGetDescriptorsCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  RecordWebBluetoothFunctionCall(
+      quantity == blink::mojom::WebBluetoothGATTQueryQuantity::SINGLE
+          ? UMAWebBluetoothFunction::CHARACTERISTIC_GET_DESCRIPTOR
+          : UMAWebBluetoothFunction::CHARACTERISTIC_GET_DESCRIPTORS);
+  RecordGetDescriptorsDescriptor(quantity, descriptors_uuid);
+
   if (descriptors_uuid &&
       BluetoothBlocklist::Get().IsExcluded(descriptors_uuid.value())) {
+    RecordGetDescriptorsOutcome(quantity, UMAGetDescriptorOutcome::BLOCKLISTED);
     callback.Run(blink::mojom::WebBluetoothResult::BLOCKLISTED_DESCRIPTOR_UUID,
                  base::nullopt /* descriptor */);
     return;
   }
 
   const CacheQueryResult query_result =
       QueryCacheForCharacteristic(characteristic_instance_id);
 
   if (query_result.outcome == CacheQueryOutcome::BAD_RENDERER) {
     return;
   }
 
   if (query_result.outcome != CacheQueryOutcome::SUCCESS) {
+    RecordGetDescriptorsOutcome(quantity, query_result.outcome);
     callback.Run(query_result.GetWebResult(), base::nullopt /* descriptor */);
     return;
   }
 
   auto descriptors =
       descriptors_uuid
           ? query_result.device->GetDescriptorsByUUID(
                 query_result.characteristic, descriptors_uuid.value())
           : query_result.characteristic->GetDescriptors();
 
@@ skipping 14 matching lines @@
     descriptor_ptr->instance_id = descriptor_instance_id;
     descriptor_ptr->uuid = descriptor->GetUUID();
     response_descriptors.push_back(std::move(descriptor_ptr));
 
     if (quantity == blink::mojom::WebBluetoothGATTQueryQuantity::SINGLE) {
       break;
     }
   }
 
   if (!response_descriptors.empty()) {
+    RecordGetDescriptorsOutcome(quantity, UMAGetDescriptorOutcome::SUCCESS);
     callback.Run(blink::mojom::WebBluetoothResult::SUCCESS,
                  std::move(response_descriptors));
     return;
   }
-
+  RecordGetDescriptorsOutcome(quantity,
+                              descriptors_uuid
+                                  ? UMAGetDescriptorOutcome::NOT_FOUND
+                                  : UMAGetDescriptorOutcome::NO_DESCRIPTORS);
   callback.Run(descriptors_uuid
                    ? blink::mojom::WebBluetoothResult::DESCRIPTOR_NOT_FOUND
                    : blink::mojom::WebBluetoothResult::NO_DESCRIPTORS_FOUND,
                base::nullopt /* descriptors */);
 }
 
 void WebBluetoothServiceImpl::RemoteCharacteristicReadValue(
     const std::string& characteristic_instance_id,
     const RemoteCharacteristicReadValueCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 592 matching lines @@
   characteristic_id_to_service_id_.clear();
   service_id_to_device_address_.clear();
   connected_devices_.reset(
       new FrameConnectedBluetoothDevices(render_frame_host_));
   allowed_devices_map_ = BluetoothAllowedDevicesMap();
   device_chooser_controller_.reset();
   BluetoothAdapterFactoryWrapper::Get().ReleaseAdapter(this);
 }
 
 }  // namespace content