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..c595a5d93b2176ebad3d2cb8a38bc5f84d41779c 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,10 @@
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/metrics/chromeos_metrics_provider.h"
+#endif
+
 #if defined(OS_WIN)
 #include <windows.h>
 #include "base/win/registry.h"
@@ -86,7 +92,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 +116,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(

[Alexei Svitkine (slow), 2014/05/28 18:45:57]

Nit: Now that there's a lot of code here, I suggest making a private
CreateMetricsService() method on client, and have the code below live in it,
rather than having this static method reach into client->metrics_service_ etc.

[blundell, 2014/05/28 18:59:49]

Done.

+      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 +331,13 @@ void ChromeMetricsServiceClient::Observe(
 
 void ChromeMetricsServiceClient::StartGatheringMetrics(
     const base::Closure& done_callback) {
-  // TODO(blundell): Move metrics gathering tasks from MetricsService to here.
+// TODO(blundell): Move all metrics gathering tasks from MetricsService to
+// here.
+#if defined(OS_CHROMEOS)
+  chromeos_metrics_provider_->InitTaskGetHardwareClass(done_callback);
+#else
   done_callback.Run();
+#endif
 }
 
 #if defined(OS_WIN)