Move initial metrics gathering tasks out of MetricsService.

chrome/browser/metrics/chrome_metrics_service_client.cc

Index: chrome/browser/metrics/chrome_metrics_service_client.cc
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 5f61241a92cd7f1e2790e5ab56e5fd69e58ec073..3c135062bdcc60371c72c80588961c95ef3d759b 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -18,8 +18,13 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/memory_details.h"
+#include "chrome/browser/metrics/chrome_stability_metrics_provider.h"
 #include "chrome/browser/metrics/extensions_metrics_provider.h"
+#include "chrome/browser/metrics/gpu_metrics_provider.h"
 #include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/metrics/network_metrics_provider.h"
+#include "chrome/browser/metrics/omnibox_metrics_provider.h"
+#include "chrome/browser/metrics/tracking_synchronizer.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ -31,7 +36,13 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 
-#if !defined(OS_ANDROID)
+#if defined(ENABLE_PLUGINS)
+#include "chrome/browser/metrics/plugin_metrics_provider.h"
+#endif
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/metrics/android_metrics_provider.h"
+#else
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
@@ -132,9 +143,40 @@ scoped_ptr<ChromeMetricsServiceClient> ChromeMetricsServiceClient::Create(
       state_manager, client.get(), g_browser_process->local_state()));
 
   // Register metrics providers.
+
   client->metrics_service_->RegisterMetricsProvider(
       scoped_ptr<metrics::MetricsProvider>(
           new ExtensionsMetricsProvider(state_manager)));
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(new NetworkMetricsProvider));
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(new OmniboxMetricsProvider));
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(new ChromeStabilityMetricsProvider));
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(new GPUMetricsProvider()));
+
+#if defined(OS_ANDROID)
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(
+          new AndroidMetricsProvider(local_state_)));
+#endif  // defined(OS_ANDROID)
+
+#if defined(OS_WIN)
+  GoogleUpdateMetricsProviderWin* google_update_metrics_provider =
+      new GoogleUpdateMetricsProviderWin;
+  client->google_update_metrics_provider_ = google_update_metrics_provider;
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(google_update_metrics_provider));
+#endif
+
+#if defined(ENABLE_PLUGINS)
+  PluginMetricsProvider* plugin_metrics_provider =
+      new PluginMetricsProvider(g_browser_process->local_state());
+  client->plugin_metrics_provider_ = plugin_metrics_provider;
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(plugin_metrics_provider));
+#endif
 
 #if defined(OS_CHROMEOS)
   ChromeOSMetricsProvider* chromeos_metrics_provider =
@@ -343,33 +385,73 @@ void ChromeMetricsServiceClient::Observe(
 
 void ChromeMetricsServiceClient::StartGatheringMetrics(
     const base::Closure& done_callback) {
-  // TODO(blundell): Move all metrics gathering tasks from MetricsService to
-  // here.
   // Schedules a task on the file thread for execution of slower
   // initialization steps (such as plugin list generation) necessary
   // for sending the initial log.  This avoids blocking the main UI
   // thread.
+  finished_gathering_initial_metrics_callback_ = done_callback;
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&ChromeMetricsServiceClient::InitTaskGetHardwareClass,
                  weak_ptr_factory_.GetWeakPtr(),
-                 base::MessageLoop::current()->message_loop_proxy(),
-                 done_callback),
+                 base::MessageLoop::current()->message_loop_proxy()),
       base::TimeDelta::FromSeconds(kInitializationDelaySeconds));
 }
 
 void ChromeMetricsServiceClient::InitTaskGetHardwareClass(
-    base::MessageLoopProxy* target_loop,
-    const base::Closure& done_callback) {
+    base::MessageLoopProxy* target_loop) {
+  base::Closure callback =
+      base::Bind(&ChromeMetricsServiceClient::OnInitTaskGotHardwareClass,
+                 weak_ptr_factory_.GetWeakPtr());
 #if defined(OS_CHROMEOS)
-  chromeos_metrics_provider_->InitTaskGetHardwareClass(target_loop,
-                                                       done_callback);
+  chromeos_metrics_provider_->InitTaskGetHardwareClass(target_loop, callback);
 #else
-  target_loop->PostTask(FROM_HERE, done_callback);
+  target_loop->PostTask(FROM_HERE, callback);
 #endif
 }
 
+void ChromeMetricsServiceClient::OnInitTaskGotHardwareClass() {
+  const base::Closure got_plugin_info_callback =
+      base::Bind(&ChromeMetricsServiceClient::OnInitTaskGotPluginInfo,
+                 weak_ptr_factory_.GetWeakPtr());
+
+#if defined(ENABLE_PLUGINS)
+  plugin_metrics_provider_->GetPluginInformation(got_plugin_info_callback);
+#else
+  got_plugin_info_callback.Run();
+#endif
+}
+
+void ChromeMetricsServiceClient::OnInitTaskGotPluginInfo() {
+  const base::Closure got_metrics_callback =
+      base::Bind(&ChromeMetricsServiceClient::OnInitTaskGotGoogleUpdateData,
+                 weak_ptr_factory_.GetWeakPtr());
+
+#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+  google_update_metrics_provider_->GetGoogleUpdateData(got_metrics_callback);
+#else
+  got_metrics_callback.Run();
+#endif
+}
+
+void ChromeMetricsServiceClient::OnInitTaskGotGoogleUpdateData() {
+  // Start the next part of the init task: fetching performance data.  This will
+  // call into |FinishedReceivingProfilerData()| when the task completes.
+  chrome_browser_metrics::TrackingSynchronizer::FetchProfilerDataAsynchronously(
+      weak_ptr_factory_.GetWeakPtr());
+}
+
+void ChromeMetricsServiceClient::ReceivedProfilerData(
+    const tracked_objects::ProcessDataSnapshot& process_data,
+    int process_type) {
+  metrics_service_->ReceivedProfilerData(process_data, process_type);
+}
+
+void ChromeMetricsServiceClient::FinishedReceivingProfilerData() {
+  finished_gathering_initial_metrics_callback_.Run();
+}
+
 #if defined(OS_WIN)
 void ChromeMetricsServiceClient::CountBrowserCrashDumpAttempts() {
   // Open the registry key for iteration.