Pass RapporService to content/browser/

components/rappor/test_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/test_rappor_service.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "components/rappor/byte_vector_utils.h"
 #include "components/rappor/proto/rappor_metric.pb.h"
-#include "components/rappor/rappor_parameters.h"
+#include "components/rappor/public/rappor_parameters.h"
 #include "components/rappor/rappor_prefs.h"
 #include "components/rappor/test_log_uploader.h"
 
 namespace rappor {
 
 namespace {
 
 bool MockIsIncognito(bool* is_incognito) {
   return *is_incognito;
 }
@@ skipping 40 matching lines @@
 }
 
 TestRapporService::~TestRapporService() {}
 
 std::unique_ptr<Sample> TestRapporService::CreateSample(RapporType type) {
   std::unique_ptr<TestSample> test_sample(new TestSample(type));
   return std::move(test_sample);
 }
 
 // Intercepts the sample being recorded and saves it in a test structure.
-void TestRapporService::RecordSampleObj(const std::string& metric_name,
-                                        std::unique_ptr<Sample> sample) {
+void TestRapporService::RecordSample(const std::string& metric_name,
+                                     std::unique_ptr<Sample> sample) {
   TestSample* test_sample = static_cast<TestSample*>(sample.get());
   // Erase the previous sample if we logged one.
   shadows_.erase(metric_name);
   shadows_.insert(std::pair<std::string, TestSample::Shadow>(
       metric_name, test_sample->GetShadow()));
   // Original version is still called.
-  RapporService::RecordSampleObj(metric_name, std::move(sample));
+  RapporService::RecordSample(metric_name, std::move(sample));
 }
 
-void TestRapporService::RecordSample(const std::string& metric_name,
-                                     RapporType type,
-                                     const std::string& sample) {
+void TestRapporService::RecordSampleString(const std::string& metric_name,
+                                           RapporType type,
+                                           const std::string& sample) {
   // Save the recorded sample to the local structure.
   RapporSample rappor_sample;
   rappor_sample.type = type;
   rappor_sample.value = sample;
   samples_[metric_name] = rappor_sample;
   // Original version is still called.
-  RapporService::RecordSample(metric_name, type, sample);
+  RapporService::RecordSampleString(metric_name, type, sample);
 }
 
 int TestRapporService::GetReportsCount() {
   RapporReports reports;
   ExportMetrics(&reports);
   return reports.report_size();
 }
 
 void TestRapporService::GetReports(RapporReports* reports) {
   ExportMetrics(reports);
@@ skipping 23 matching lines @@
 void TestRapporService::CancelNextLogRotation() {
   next_rotation_ = base::TimeDelta();
 }
 
 // Schedule the next call to OnLogInterval.
 void TestRapporService::ScheduleNextLogRotation(base::TimeDelta interval) {
   next_rotation_ = interval;
 }
 
 }  // namespace rappor