Introduce a MetricsServicesManager class.

This class now owns MetricsService, VariationsService
and RapporService as well as MetricsStateManager.

The motivation is to be able to pass MetricsStateManager
to VariationsService (in a followup CL), so that it
can be used for simulation.

BUG=315807

Review URL: https://codereview.chromium.org/263093003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269144 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index dd64ee7..75258d0 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -23,6 +23,7 @@
 
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
+class MetricsServicesManager;
 class RemoteDebuggingServer;
 class PrefRegistrySimple;
 class PromoResourceService;
@@ -135,7 +136,6 @@ class BrowserProcessImpl : public BrowserProcess,
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:
-  void CreateMetricsService();
   void CreateWatchdogThread();
   void CreateProfileManager();
   void CreateLocalState();
@@ -151,14 +151,13 @@ class BrowserProcessImpl : public BrowserProcess,
   void CreateStatusTray();
   void CreateBackgroundModeManager();
 
+  MetricsServicesManager* GetMetricsServicesManager();
+
   void ApplyAllowCrossOriginAuthPromptPolicy();
   void ApplyDefaultBrowserPolicy();
   void ApplyMetricsReportingPolicy();
 
-  bool created_metrics_service_;
-  scoped_ptr<MetricsService> metrics_service_;
-
-  scoped_ptr<rappor::RapporService> rappor_service_;
+  scoped_ptr<MetricsServicesManager> metrics_services_manager_;
 
   scoped_ptr<IOThread> io_thread_;
 
@@ -206,8 +205,6 @@ class BrowserProcessImpl : public BrowserProcess,
 
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
 
-  scoped_ptr<chrome_variations::VariationsService> variations_service_;
-
   // Manager for desktop notification UI.
   bool created_notification_ui_manager_;
   scoped_ptr<NotificationUIManager> notification_ui_manager_;