[bluetooth] Switch from RAPPOR to UKM for Web Bluetooth metrics

This collects effectively the same data but uses the more modern
infrastructure.

Bug: 1017844
Change-Id: Ibafe3991d5129faf0481bef7acb8e7cd157cae12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895946
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Auto-Submit: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715094}

components/page_load_metrics/browser/observers/use_counter/ukm_features.cc

@@ -144,6 +144,8 @@ UseCounterPageLoadMetricsObserver::GetAllowedUkmFeatures() {
           WebFeature::kMovedOrResizedPopup2sAfterCreation,
           WebFeature::kDOMWindowOpenPositioningFeatures,
           WebFeature::kCSSSelectorInternalMediaControlsOverlayCastButton,
+          WebFeature::kWebBluetoothRequestDevice,
+          WebFeature::kWebBluetoothRequestScan,
       }));
   return *opt_in_features;
 }

third_party/blink/renderer/modules/bluetooth/bluetooth.cc

@@ -12,7 +12,6 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/mojom/bluetooth/web_bluetooth.mojom-blink.h"
-#include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/core/dom/document.h"
@@ -236,9 +235,6 @@ ScriptPromise Bluetooth::requestDevice(ScriptState* script_state,
   if (exception_state.HadException())
     return ScriptPromise();
 
-  // Record the eTLD+1 of the frame using the API.
-  Platform::Current()->RecordRapporURL("Bluetooth.APIUsage.Origin", doc.Url());
-
   // Subsequent steps are handled in the browser process.
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
   ScriptPromise promise = resolver->Promise();
@@ -354,9 +350,6 @@ ScriptPromise Bluetooth::requestLEScan(ScriptState* script_state,
   if (exception_state.HadException())
     return ScriptPromise();
 
-  // Record the eTLD+1 of the frame using the API.
-  Platform::Current()->RecordRapporURL("Bluetooth.APIUsage.Origin", doc.Url());
-
   // Subsequent steps are handled in the browser process.
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
   ScriptPromise promise = resolver->Promise();

tools/metrics/rappor/rappor.xml

@@ -101,15 +101,6 @@ components/rappor/rappor_parameters.h.
 <!-- Rappor metric definitions -->
 
 <rappor-metrics>
-<rappor-metric name="Bluetooth.APIUsage.Origin" type="ETLD_PLUS_ONE">
-  <owner>jyasskin@chromium.org</owner>
-  <owner>ortuno@chromium.org</owner>
-  <owner>scheib@chromium.org</owner>
-  <summary>
-    The eTLD+1 of the URL of frames using the Web Bluetooth API.
-  </summary>
-</rappor-metric>
-
 <rappor-metric name="CustomTabs.ServiceClient.PackageName"
     type="UMA_RAPPOR_TYPE">
   <owner>yusufo@chromium.org</owner>