Remove unused Flash RAPPOR metrics.

BUG=1016906

Change-Id: I601f1c1cc3f23c5598d5bedf3b22ad6fbf810cfc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904306Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713631}

chrome/browser/plugins/plugin_info_host_impl.cc

@@ -40,7 +40,6 @@
 #include "components/nacl/common/buildflags.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
-#include "components/rappor/rappor_service_impl.h"
 #include "components/ukm/content/source_url_recorder.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/plugin_service.h"
@@ -412,7 +411,7 @@ void PluginInfoHostImpl::GetPluginInfoFinish(
   context_.MaybeGrantAccess(output->status, output->plugin.path);
 
   if (output->status != chrome::mojom::PluginStatus::kNotFound) {
-    ReportMetrics(params.render_frame_id, output->actual_mime_type, params.url,
+    ReportMetrics(params.render_frame_id, output->actual_mime_type,
                   params.main_frame_origin);
   }
   std::move(callback).Run(std::move(output));
@@ -420,7 +419,6 @@ void PluginInfoHostImpl::GetPluginInfoFinish(
 
 void PluginInfoHostImpl::ReportMetrics(int render_frame_id,
                                        const base::StringPiece& mime_type,
-                                       const GURL& url,
                                        const url::Origin& main_frame_origin) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -435,10 +433,6 @@ void PluginInfoHostImpl::ReportMetrics(int render_frame_id,
   if (web_contents->GetBrowserContext()->IsOffTheRecord())
     return;
 
-  rappor::RapporServiceImpl* rappor_service =
-      g_browser_process->rappor_service();
-  if (!rappor_service)
-    return;
   if (main_frame_origin.opaque())
     return;
 
@@ -447,16 +441,6 @@ void PluginInfoHostImpl::ReportMetrics(int render_frame_id,
     return;
   }
 
-  rappor_service->RecordSampleString(
-      "Plugins.FlashOriginUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
-      net::registry_controlled_domains::GetDomainAndRegistry(
-          main_frame_origin.GetURL(),
-          net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
-  rappor_service->RecordSampleString(
-      "Plugins.FlashUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
-      net::registry_controlled_domains::GetDomainAndRegistry(
-          url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
-
   ukm::builders::Plugins_FlashInstance(
       ukm::GetSourceIdForWebContentsDocument(web_contents))
       .Record(ukm::UkmRecorder::Get());

chrome/browser/plugins/plugin_info_host_impl.h

@@ -130,10 +130,9 @@ class PluginInfoHostImpl : public chrome::mojom::PluginInfoHost {
                            GetPluginInfoCallback callback,
                            std::unique_ptr<PluginMetadata> plugin_metadata);
 
-  // Reports usage metrics to RAPPOR and UKM.
+  // Reports usage metrics to UKM.
   void ReportMetrics(int render_frame_id,
                      const base::StringPiece& mime_type,
-                     const GURL& url,
                      const url::Origin& main_frame_origin);
 
   Context context_;

tools/metrics/rappor/rappor.xml

@@ -174,27 +174,6 @@ components/rappor/rappor_parameters.h.
   </summary>
 </rappor-metric>
 
-<rappor-metric name="Plugins.FlashOriginUrl" type="ETLD_PLUS_ONE">
-  <owner>wfh@chromium.org</owner>
-  <summary>
-    The domain and registry of the top level URL of a page which attempts to
-    launch a Flash NPAPI or PPAPI plugin, if the client has Flash installed and
-    enabled. Recorded when the plugin frame appears for each Flash object found
-    on the page, even if the plugin is click-to-play.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Plugins.FlashUrl" type="ETLD_PLUS_ONE">
-  <owner>wfh@chromium.org</owner>
-  <summary>
-    The domain and registry of the URL from where Flash SWF or SPL content is
-    being loaded from, while attempting to launch a Flash (NPAPI or PPAPI)
-    plugin that is installed and enabled. Recorded when the plugin frame appears
-    for each Flash object found in the page, even if the plugin is
-    click-to-play.
-  </summary>
-</rappor-metric>
-
 <rappor-metric name="PowerfulFeatureUse.ETLDPlus1.GetUserMedia.Insecure"
     type="ETLD_PLUS_ONE">
   <owner>guidou@chromium.org</owner>