Componentizing SafeBrowsingBlockingPage Part 1

components/security_interstitials/core/metrics_helper.h

Index: components/security_interstitials/core/metrics_helper.h
diff --git a/components/security_interstitials/core/metrics_helper.h b/components/security_interstitials/core/metrics_helper.h
index 1d37420d6c79346dc52e42fd87cb42b213590968..707a0d3930efd714657c71607eb5eee16ee62520 100644
--- a/components/security_interstitials/core/metrics_helper.h
+++ b/components/security_interstitials/core/metrics_helper.h
@@ -11,7 +11,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
-#include "components/rappor/rappor_service_impl.h"
 #include "url/gurl.h"
 
 namespace history {
@@ -21,13 +20,11 @@ class HistoryService;
 namespace security_interstitials {
 
 // MetricsHelper records user warning interactions in a common way via METRICS
-// histograms and, optionally, RAPPOR metrics. The class will generate the
+// histograms. The class will generate the

[Nathan Parker, 2016/12/15 23:30:42]

nit: reflow comment

[Jialiu Lin, 2016/12/16 00:51:42]

Done.

 // following histograms:
 //   METRICS: interstitial.<metric_prefix>.decision[.repeat_visit]
 //   METRICS: interstitial.<metric_prefix>.interaction[.repeat_visi]

[Nathan Parker, 2016/12/15 23:30:42]

nit:repeat_visit

[Jialiu Lin, 2016/12/16 00:51:42]

Done.

-//   RAPPOR:  interstitial.<rappor_prefix> (SafeBrowsing parameters)
-//   RAPPOR:  interstitial.<rappor_prefix>2 (Low frequency parameters)
-// wherein |metric_prefix| and |rappor_prefix| are specified via ReportDetails.
+// wherein |metric_prefix| is specified via ReportDetails.
 // repeat_visit is also generated if the user has seen the page before.
 //
 // If |extra_suffix| is not empty, MetricsHelper will append ".<extra_suffix>"
@@ -64,45 +61,28 @@ class MetricsHelper {
   // extra_suffix: If not-empty, will generate second set of metrics by
   //               placing at the end of the metric name.  Examples:
   //               "from_datasaver", "from_device"
-  // rappor_prefix: Metric prefix for Rappor.
-  //                examples: "phishing2", "ssl3"
-  // rappor_report_type: Specifies the low-frequency RAPPOR configuration to use
-  //                     (i.e. UMA or Safe Browsing).
-  // deprecated_rappor_report_type: Specifies the deprecated RAPPOR
-  //                                configuration to use for comparison with the
-  //                                low-frequency metric.
-  // The rappor preferences can be left blank if rappor_service is not set.
-  // TODO(dominickn): remove deprecated_rappor_report_type once sufficient
-  // comparison data has been collected and analysed - crbug.com/605836.
   struct ReportDetails {
     ReportDetails();
     ReportDetails(const ReportDetails& other);
     ~ReportDetails();
     std::string metric_prefix;
     std::string extra_suffix;
-    std::string rappor_prefix;
-    std::string deprecated_rappor_prefix;
-    rappor::RapporType rappor_report_type;
-    rappor::RapporType deprecated_rappor_report_type;
   };
 
   // Args:
   //   url: URL of page that triggered the interstitial. Only origin is used.
   //   history_service: Set this to record metrics based on whether the user
   //                    has visited this hostname before.
-  //   rappor_service: If you want RAPPOR statistics, provide a service,
-  //                   settings.rappor_prefix, and settings.rappor_report_type.
   //   settings: Specify reporting details (prefixes and report types).
   //   sampling_event_name: Event name for Experience Sampling.
   //                        e.g. "phishing_interstitial_"
   MetricsHelper(const GURL& url,
                 const ReportDetails settings,
-                history::HistoryService* history_service,
-                const base::WeakPtr<rappor::RapporService>& rappor_service);
+                history::HistoryService* history_service);
   virtual ~MetricsHelper();
 
   // Records a user decision or interaction to the appropriate UMA metrics
-  // histogram and potentially in a RAPPOR metric.
+  // histogram.
   void RecordUserDecision(Decision decision);
   void RecordUserInteraction(Interaction interaction);
   void RecordShutdownMetrics();
@@ -124,12 +104,8 @@ class MetricsHelper {
 
   void RecordUserDecisionToMetrics(Decision decision,
                                    const std::string& histogram_name);
-  void RecordUserDecisionToRappor(Decision decision,
-                                  const rappor::RapporType rappor_report_type,
-                                  const std::string& rappor_prefix);
   const GURL request_url_;
   const ReportDetails settings_;
-  base::WeakPtr<rappor::RapporService> rappor_service_;
   int num_visits_;
   base::CancelableTaskTracker request_tracker_;