Pass RapporService to content/browser/

components/security_interstitials/core/metrics_helper.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/security_interstitials/core/metrics_helper.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #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;
 using base::UserMetricsAction;
 
 namespace security_interstitials {
 
 namespace {
 
 // Used for setting bits in Rappor's "interstitial.*.flags"
@@ skipping 84 matching lines @@
 
 MetricsHelper::ReportDetails::ReportDetails()
     : rappor_report_type(rappor::NUM_RAPPOR_TYPES) {}
 
 MetricsHelper::ReportDetails::ReportDetails(const ReportDetails& other) =
     default;
 
 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),
       num_visits_(-1) {
   DCHECK(!settings_.metric_prefix.empty());
   if (settings_.rappor_report_type == rappor::NUM_RAPPOR_TYPES)  // Default.
     rappor_service_.reset();
   DCHECK(!rappor_service_ || !settings_.rappor_prefix.empty());
   if (history_service) {
     history_service->GetVisibleVisitCountToHost(
@@ skipping 53 matching lines @@
   if (num_visits_ >= 0) {
     int flags = 0;
     if (decision == PROCEED)
       flags |= 1 << InterstitialFlagBits::DID_PROCEED;
     if (num_visits_ > 0)
       flags |= 1 << InterstitialFlagBits::IS_REPEAT_VISIT;
     // e.g. "interstitial.malware.flags"
     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) {
   const std::string histogram_name(
       "interstitial." + settings_.metric_prefix + ".interaction");
   RecordSingleInteractionToMetrics(interaction, histogram_name);
   if (!settings_.extra_suffix.empty()) {
     RecordSingleInteractionToMetrics(
         interaction, histogram_name + "." + settings_.extra_suffix);
   }
@@ skipping 11 matching lines @@
 }
 
 void MetricsHelper::OnGotHistoryCount(bool success,
                                       int num_visits,
                                       base::Time /*first_visit*/) {
   if (success)
     num_visits_ = num_visits;
 }
 
 }  // namespace security_interstitials