Pass RapporService to content/browser/

components/metrics_services_manager/metrics_services_manager.h

Index: components/metrics_services_manager/metrics_services_manager.h
diff --git a/components/metrics_services_manager/metrics_services_manager.h b/components/metrics_services_manager/metrics_services_manager.h
index e70d6489066c40e1278f51c593097ec4d3d2b647..19245c140596ad6a1bc45bf9bb2e517382e6c148 100644
--- a/components/metrics_services_manager/metrics_services_manager.h
+++ b/components/metrics_services_manager/metrics_services_manager.h
@@ -22,7 +22,7 @@ class MetricsStateManager;
 }
 
 namespace rappor {
-class RapporService;
+class RapporServiceImpl;
 }
 
 namespace variations {
@@ -35,7 +35,7 @@ class MetricsServicesManagerClient;
 
 // MetricsServicesManager is a helper class for embedders that use the various
 // metrics-related services in a Chrome-like fashion: MetricsService (via its
-// client), RapporService and VariationsService.
+// client), RapporServiceImpl and VariationsService.
 class MetricsServicesManager {
  public:
   // Creates the MetricsServicesManager with the given client.
@@ -57,8 +57,8 @@ class MetricsServicesManager {
   // additionally creating the MetricsServiceClient in that case).
   metrics::MetricsService* GetMetricsService();
 
-  // Returns the RapporService, creating it if it hasn't been created yet.
-  rappor::RapporService* GetRapporService();
+  // Returns the RapporServiceImpl, creating it if it hasn't been created yet.
+  rappor::RapporServiceImpl* GetRapporServiceImpl();
 
   // Returns the VariationsService, creating it if it hasn't been created yet.
   variations::VariationsService* GetVariationsService();
@@ -80,7 +80,7 @@ class MetricsServicesManager {
  private:
   // Update the managed services when permissions for recording/uploading
   // metrics change.
-  void UpdateRapporService();
+  void UpdateRapporServiceImpl();
 
   // Returns the MetricsServiceClient, creating it if it hasn't been
   // created yet (and additionally creating the MetricsService in that case).
@@ -106,8 +106,8 @@ class MetricsServicesManager {
   // The MetricsServiceClient. Owns the MetricsService.
   std::unique_ptr<metrics::MetricsServiceClient> metrics_service_client_;
 
-  // The RapporService, for RAPPOR metric uploads.
-  std::unique_ptr<rappor::RapporService> rappor_service_;
+  // The RapporServiceImpl, for RAPPOR metric uploads.
+  std::unique_ptr<rappor::RapporServiceImpl> rappor_service_;
 
   // The VariationsService, for server-side experiments infrastructure.
   std::unique_ptr<variations::VariationsService> variations_service_;