Move initial metrics gathering tasks out of MetricsService.

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a8ab8742b5defa7a7eaea855ead7720912feb706..801f715ff7e37585219394d9d684b34e60b69b47 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -160,6 +160,7 @@
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h"
+#include "chrome/browser/metrics/chrome_stability_metrics_provider.h"
 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
@@ -179,6 +180,10 @@
 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/metrics/android_metrics_provider.h"
+#endif
+
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/browser_view_prefs.h"
 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h"
@@ -188,6 +193,10 @@
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #endif
 
+#if defined(ENABLE_PLUGINS)
+#include "chrome/browser/metrics/plugin_metrics_provider.h"
+#endif
+
 namespace {
 
 enum MigratedPreferences {
@@ -223,6 +232,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   browser_shutdown::RegisterPrefs(registry);
   BrowserProcessImpl::RegisterPrefs(registry);
   chrome_prefs::RegisterPrefs(registry);
+  ChromeStabilityMetricsProvider::RegisterPrefs(registry);
   chrome_variations::VariationsService::RegisterPrefs(registry);
   component_updater::RegisterPrefsForRecoveryComponent(registry);
   ExternalProtocolHandler::RegisterPrefs(registry);
@@ -261,6 +271,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 
 #if defined(ENABLE_PLUGINS)
   PluginFinder::RegisterPrefs(registry);
+  PluginMetricsProvider::RegisterPrefs(registry);
 #endif
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
@@ -317,6 +328,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   QuitWithAppsController::RegisterPrefs(registry);
 #endif
 
+#if defined(OS_ANDROID)
+  AndroidMetricsProvider::RegisterPrefs(registry);
+#endif  // defined(OS_ANDROID)
+
 #if defined(OS_WIN)
   app_metro_launch::RegisterPrefs(registry);
   password_manager::PasswordManager::RegisterLocalPrefs(registry);