Pass RapporService to content/browser/

components/rappor/rappor_service.cc

Index: components/rappor/rappor_service.cc
diff --git a/components/rappor/rappor_service.cc b/components/rappor/rappor_service.cc
index 18d57eea21c5f22c22bd47caa2ededaf374fe44c..a4c56845b0af94f074e264e90c0337a961e734ca 100644
--- a/components/rappor/rappor_service.cc
+++ b/components/rappor/rappor_service.cc
@@ -203,9 +203,9 @@ bool RapporService::RecordingAllowed(const RapporParameters& parameters) {
   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())
@@ -252,8 +252,8 @@ std::unique_ptr<Sample> RapporService::CreateSample(RapporType type) {
       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;