Move ChromeOS hardware class init 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 8f04a1c316a4fdde45a545497695effacf3283a5..2c896758c24d6d710a35e7394b41afe3a14a2de1 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/memory_details.h"
+#include "chrome/browser/metrics/extensions_metrics_provider.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_constants.h"
@@ -25,6 +26,7 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/render_messages.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/histogram_fetcher.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
@@ -33,6 +35,11 @@
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+//#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/metrics/chromeos_metrics_provider.h"
+#endif
+
 #if defined(OS_WIN)
 #include <windows.h>
 #include "base/win/registry.h"
@@ -41,6 +48,18 @@
 
 namespace {
 
+// The delay, in seconds, after starting recording before doing expensive
+// initialization work.
+#if defined(OS_ANDROID) || defined(OS_IOS)
+// On mobile devices, a significant portion of sessions last less than a minute.
+// Use a shorter timer on these platforms to avoid losing data.
+// TODO(dfalcantara): To avoid delaying startup, tighten up initialization so
+//                    that it occurs after the user gets their initial page.
+const int kInitializationDelaySeconds = 5;
+#else
+const int kInitializationDelaySeconds = 30;
+#endif
+
 // This specifies the amount of time to wait for all renderers to send their
 // data.
 const int kMaxHistogramGatheringWaitDuration = 60000;  // 60 seconds.
@@ -86,7 +105,8 @@ class MetricsMemoryDetails : public MemoryDetails {
 
 ChromeMetricsServiceClient::ChromeMetricsServiceClient(
     metrics::MetricsStateManager* state_manager)
-    : waiting_for_collect_final_metrics_step_(false),
+    : chromeos_metrics_provider_(NULL),
+      waiting_for_collect_final_metrics_step_(false),
       num_async_histogram_fetches_in_progress_(0),
       weak_ptr_factory_(this) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -109,8 +129,22 @@ scoped_ptr<ChromeMetricsServiceClient> ChromeMetricsServiceClient::Create(
   // receives pointers to fully constructed objects.
   scoped_ptr<ChromeMetricsServiceClient> client(
       new ChromeMetricsServiceClient(state_manager));
-  client->metrics_service_.reset(
-      new MetricsService(state_manager, client.get()));
+  client->metrics_service_.reset(new MetricsService(
+      state_manager, client.get(), g_browser_process->local_state()));
+
+  // Register metrics providers.
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(
+          new ExtensionsMetricsProvider(state_manager)));
+
+#if defined(OS_CHROMEOS)
+  ChromeOSMetricsProvider* chromeos_metrics_provider =
+      new ChromeOSMetricsProvider;
+  client->chromeos_metrics_provider_ = chromeos_metrics_provider;
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(chromeos_metrics_provider));
+#endif
+
   return client.Pass();
 }
 
@@ -310,8 +344,31 @@ void ChromeMetricsServiceClient::Observe(
 
 void ChromeMetricsServiceClient::StartGatheringMetrics(
     const base::Closure& done_callback) {
-  // TODO(blundell): Move metrics gathering tasks from MetricsService to here.
-  done_callback.Run();
+  // 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.
+  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::TimeDelta::FromSeconds(kInitializationDelaySeconds));
+}
+
+void ChromeMetricsServiceClient::InitTaskGetHardwareClass(
+    base::MessageLoopProxy* target_loop,
+    const base::Closure& done_callback) {
+#if defined(OS_CHROMEOS)
+  chromeos_metrics_provider_->InitTaskGetHardwareClass(target_loop,
+                                                       done_callback);
+#else
+  target_loop->PostTask(FROM_HERE, done_callback);
+#endif
 }
 
 #if defined(OS_WIN)