Pass RapporService to content/browser/

components/security_interstitials/core/metrics_helper.cc

Index: components/security_interstitials/core/metrics_helper.cc
diff --git a/components/security_interstitials/core/metrics_helper.cc b/components/security_interstitials/core/metrics_helper.cc
index 17073b3c6d102ec198d16b23c598ef9dcc89c5f6..6ec4ce0c21d2075a3fdaed640295a5f11514c66a 100644
--- a/components/security_interstitials/core/metrics_helper.cc
+++ b/components/security_interstitials/core/metrics_helper.cc
@@ -11,8 +11,8 @@
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "components/history/core/browser/history_service.h"
-#include "components/rappor/rappor_service.h"
-#include "components/rappor/rappor_utils.h"
+#include "components/rappor/public/rappor_utils.h"
+#include "components/rappor/rappor_service_impl.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 using base::RecordAction;
@@ -117,10 +117,10 @@ MetricsHelper::ReportDetails::ReportDetails(const ReportDetails& other) =
 MetricsHelper::ReportDetails::~ReportDetails() {}
 
 MetricsHelper::MetricsHelper(
-  const GURL& request_url,
-  const ReportDetails settings,
-  history::HistoryService* history_service,
-  const base::WeakPtr<rappor::RapporService>& rappor_service)
+    const GURL& request_url,

[estark, 2016/12/07 00:45:02]

did `git cl format` do this?

[Navid Zolghadr, 2016/12/07 00:49:34]

I certainly did not do it manually. I just re-ran "git cl format" locally and it
didn't change it. So I assume this is the format it liked and it changed it the
first time I ran the command on this patch.

+    const ReportDetails settings,
+    history::HistoryService* history_service,
+    const base::WeakPtr<rappor::RapporService>& rappor_service)
     : request_url_(request_url),
       settings_(settings),
       rappor_service_(rappor_service),
@@ -194,8 +194,8 @@ void MetricsHelper::RecordUserDecisionToRappor(
     sample->SetFlagsField("flags", flags,
                           InterstitialFlagBits::HIGHEST_USED_BIT + 1);
   }
-  rappor_service_->RecordSampleObj("interstitial." + rappor_prefix,
-                                   std::move(sample));
+  rappor_service_->RecordSample("interstitial." + rappor_prefix,
+                                std::move(sample));
 }
 
 void MetricsHelper::RecordUserInteraction(Interaction interaction) {