Pass RapporService to content/browser/

components/rappor/rappor_service.cc

 // Copyright 2014 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/rappor/rappor_service.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
@@ skipping 185 matching lines @@
   }
   // Skip this metric if its recording_group is not enabled.
   if (!(recording_groups_ & parameters.recording_group)) {
     DVLOG(2) << "Metric not logged due to recording_group "
              << recording_groups_ << " < " << parameters.recording_group;
     return false;
   }
   return true;
 }
 
-void RapporService::RecordSample(const std::string& metric_name,
-                                 RapporType type,
-                                 const std::string& sample) {
+void RapporService::RecordSampleString(const std::string& metric_name,
+                                       RapporType type,
+                                       const std::string& sample) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Ignore the sample if the service hasn't started yet.
   if (!IsInitialized())
     return;
   DCHECK_LT(type, NUM_RAPPOR_TYPES);
   const RapporParameters& parameters = internal::kRapporParametersForType[type];
   DVLOG(2) << "Recording sample \"" << sample
            << "\" for metric \"" << metric_name
            << "\" of type: " << type;
   RecordSampleInternal(metric_name, parameters, sample);
@@ skipping 26 matching lines @@
   return new_metric;
 }
 
 std::unique_ptr<Sample> RapporService::CreateSample(RapporType type) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(IsInitialized());
   return base::WrapUnique(
       new Sample(cohort_, internal::kRapporParametersForType[type]));
 }
 
-void RapporService::RecordSampleObj(const std::string& metric_name,
-                                    std::unique_ptr<Sample> sample) {
+void RapporService::RecordSample(const std::string& metric_name,
+                                 std::unique_ptr<Sample> sample) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!RecordingAllowed(sample->parameters()))
     return;
   DVLOG(1) << "Recording sample of metric \"" << metric_name << "\"";
   sampler_.AddSample(metric_name, std::move(sample));
 }
 
 }  // namespace rappor