Pass RapporService to content/browser/

components/rappor/test_rappor_service.h

Index: components/rappor/test_rappor_service.h
diff --git a/components/rappor/test_rappor_service.h b/components/rappor/test_rappor_service.h
index 01a850ccd502f9812efa7eae6ee7a95465e55461..99ee44f34b110873f1f7a1b6b3bf5aca5f7cfa9e 100644
--- a/components/rappor/test_rappor_service.h
+++ b/components/rappor/test_rappor_service.h
@@ -59,11 +59,11 @@ class TestRapporService : public RapporService {
 
   // RapporService:
   std::unique_ptr<Sample> CreateSample(RapporType type) override;
-  void RecordSampleObj(const std::string& metric_name,
-                       std::unique_ptr<Sample> sample) override;
   void RecordSample(const std::string& metric_name,
-                    RapporType type,
-                    const std::string& sample) override;
+                    std::unique_ptr<Sample> sample) override;
+  void RecordSampleString(const std::string& metric_name,
+                          RapporType type,
+                          const std::string& sample) override;
 
   // Gets the number of reports that would be uploaded by this service.
   // This also clears the internal map of metrics as a biproduct, so if