RAPPOR: remove a few media related RAPPOR metrics.

Bug: 1016906
Change-Id: I9baa32384e0b82490efc605583878681a85c7245
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1898621
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712679}

chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPictureController.java

@@ -25,7 +25,6 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
-import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
@@ -51,7 +50,6 @@ public class PictureInPictureController {
     private static final String TAG = "VideoPersist";
 
     // Metrics
-    private static final String METRICS_URL = "Media.VideoPersistence.TopFrame";
     private static final String METRICS_DURATION = "Media.VideoPersistence.Duration";
 
     private static final String METRICS_ATTEMPT_RESULT = "Media.VideoPersistence.AttemptResult";
@@ -211,8 +209,6 @@ public class PictureInPictureController {
         // Setup observers to dismiss the Activity on events that should end PiP.
         final Tab activityTab = activity.getActivityTab();
 
-        RapporServiceBridge.sampleDomainAndRegistryFromURL(METRICS_URL, activityTab.getUrl());
-
         final TabObserver tabObserver = new DismissActivityOnTabEventObserver(activity);
         final TabModelSelectorObserver tabModelSelectorObserver =
                 new DismissActivityOnTabModelSelectorEventObserver(activity);

chrome/android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java

@@ -10,7 +10,6 @@ import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -145,18 +144,6 @@ public class RecordCastAction {
         }
     }
 
-    /**
-     * Record the domain and registry of the URL of the frame where the user is casting the video
-     * from using Rappor.
-     *
-     * @param url The frame URL to record the domain and registry of.
-     */
-    public static void castDomainAndRegistry(String url) {
-        if (LibraryLoader.getInstance().isInitialized()) {
-            RapporServiceBridge.sampleDomainAndRegistryFromURL("Cast.Sender.MediaFrameUrl", url);
-        }
-    }
-
     /**
      * Record the ratio of the time the media element was detached from the remote playback session
      * to the total duration of the session (as from when the element has been attached till when

third_party/blink/renderer/core/html/media/autoplay_uma_helper.cc

@@ -7,7 +7,6 @@
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "services/metrics/public/cpp/ukm_recorder.h"
 #include "third_party/blink/public/platform/interface_provider.h"
-#include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
@@ -102,26 +101,6 @@ void AutoplayUmaHelper::OnAutoplayInitiated(AutoplaySource source) {
     }
   }
 
-  // Record the child frame and top-level frame URLs for autoplay muted videos
-  // by attribute.
-  if (element_->IsHTMLVideoElement() && element_->muted()) {
-    if (sources_.size() ==
-        static_cast<size_t>(AutoplaySource::kNumberOfSources)) {
-      Platform::Current()->RecordRapporURL(
-          "Media.Video.Autoplay.Muted.DualSource.Frame",
-          element_->GetDocument().Url());
-    } else if (source == AutoplaySource::kAttribute) {
-      Platform::Current()->RecordRapporURL(
-          "Media.Video.Autoplay.Muted.Attribute.Frame",
-          element_->GetDocument().Url());
-    } else {
-      DCHECK(source == AutoplaySource::kMethod);
-      Platform::Current()->RecordRapporURL(
-          "Media.Video.Autoplay.Muted.PlayMethod.Frame",
-          element_->GetDocument().Url());
-    }
-  }
-
   // Record if it will be blocked by the Autoplay setting.
   if (element_->IsHTMLVideoElement() && element_->muted() &&
       AutoplayPolicy::DocumentShouldAutoplayMutedVideos(

third_party/blink/renderer/modules/media_controls/elements/media_control_cast_button_element.cc

@@ -93,13 +93,9 @@ void MediaControlCastButtonElement::DefaultEventHandler(Event& event) {
     if (is_overlay_button_) {
       Platform::Current()->RecordAction(
           UserMetricsAction("Media.Controls.CastOverlay"));
-      Platform::Current()->RecordRapporURL("Media.Controls.CastOverlay",
-                                           WebURL(GetDocument().Url()));
     } else {
       Platform::Current()->RecordAction(
           UserMetricsAction("Media.Controls.Cast"));
-      Platform::Current()->RecordRapporURL("Media.Controls.Cast",
-                                           WebURL(GetDocument().Url()));
     }
 
     RemotePlayback::From(MediaElement()).PromptInternal();

third_party/blink/renderer/modules/mediasession/media_session.cc

@@ -7,7 +7,6 @@
 #include <memory>
 #include "base/optional.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
-#include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_media_session_action_handler.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/user_gesture_indicator.h"
@@ -322,12 +321,8 @@ mojom::blink::MediaSessionService* MediaSession::GetService() {
       GetExecutionContext()->GetTaskRunner(TaskType::kMiscPlatformAPI);
   frame->GetBrowserInterfaceBroker().GetInterface(
       service_.BindNewPipeAndPassReceiver());
-  if (service_.get()) {
-    // Record the eTLD+1 of the frame using the API.
-    Platform::Current()->RecordRapporURL("Media.Session.APIUsage.Origin",
-                                         document->Url());
+  if (service_.get())
     service_->SetClient(client_receiver_.BindNewPipeAndPassRemote(task_runner));
-  }
 
   return service_.get();
 }

tools/metrics/rappor/rappor.xml

@@ -110,15 +110,6 @@ components/rappor/rappor_parameters.h.
   </summary>
 </rappor-metric>
 
-<rappor-metric name="Cast.Sender.MediaFrameUrl" type="ETLD_PLUS_ONE">
-  <owner>avayvod@chromium.org</owner>
-  <owner>aberent@chromium.org</owner>
-  <summary>
-    The domain and registry of the frame URL that the user is trying to cast the
-    media from. Recorded every time the user casts the media.
-  </summary>
-</rappor-metric>
-
 <rappor-metric name="ContentSettings.Plugins.AddedAllowException"
     type="ETLD_PLUS_ONE">
   <owner>tommycli@chromium.org</owner>
@@ -178,73 +169,6 @@ components/rappor/rappor_parameters.h.
   </summary>
 </rappor-metric>
 
-<rappor-metric name="Media.Controls.Cast" type="ETLD_PLUS_ONE">
-  <owner>beccahughes@chromium.org</owner>
-  <owner>media-team@chromium.org</owner>
-  <summary>
-    The URL of the page when the user casts media using the normal button.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Media.Controls.CastOverlay" type="ETLD_PLUS_ONE">
-  <owner>beccahughes@chromium.org</owner>
-  <owner>media-team@chromium.org</owner>
-  <summary>
-    The URL of the page when the user casts media using the overlay button.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Media.Session.APIUsage.Origin" type="ETLD_PLUS_ONE">
-  <owner>avayvod@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
-  <owner>zqzhang@chromium.org</owner>
-  <summary>
-    The eTLD+1 of the URL of frames using the Media Session API.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Media.Video.Autoplay.Muted.Attribute.Frame"
-    type="ETLD_PLUS_ONE">
-  <owner>avayvod@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
-  <owner>zqzhang@chromium.org</owner>
-  <summary>
-    The eTLD+1 of the frame URL that has an autoplay muted video by attribute.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Media.Video.Autoplay.Muted.DualSource.Frame"
-    type="ETLD_PLUS_ONE">
-  <owner>avayvod@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
-  <owner>zqzhang@chromium.org</owner>
-  <summary>
-    The eTLD+1 of the frame URL that has an autoplay muted video by both
-    attribute and play() method.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Media.Video.Autoplay.Muted.PlayMethod.Frame"
-    type="ETLD_PLUS_ONE">
-  <owner>avayvod@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
-  <owner>zqzhang@chromium.org</owner>
-  <summary>
-    The eTLD+1 of the frame URL that has an autoplay muted video by play()
-    method.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Media.VideoPersistence.TopFrame" type="ETLD_PLUS_ONE">
-  <owner>mlamouri@chromium.org</owner>
-  <owner>peconn@chromium.org</owner>
-  <owner>zqzhang@chromium.org</owner>
-  <summary>
-    The eTLD+1 of the top frame of the tab when a video persistence session is
-    initialized.
-  </summary>
-</rappor-metric>
-
 <rappor-metric name="NTP.ExplicitUserAction.PageNavigation.NTPTileClick"
     type="UMA_RAPPOR_TYPE">
   <owner>knn@chromium.org</owner>