Move ChromeOS hardware class init out of MetricsService.

chrome/browser/metrics/metrics_service.h

Index: chrome/browser/metrics/metrics_service.h
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 9d7cde51a0c378ec9f0ea66f373ce77a6efad84c..705392fcb0b5327003f8859334fccf23c93eee7a 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -258,14 +258,11 @@ class MetricsService
 
   typedef std::vector<SyntheticTrialGroup> SyntheticTrialGroups;
 
-  // First part of the init task. Called on the FILE thread to load hardware
-  // class information.
-  static void InitTaskGetHardwareClass(base::WeakPtr<MetricsService> self,
-                                       base::MessageLoopProxy* target_loop);
+  // Calls into the client to start metrics gathering.
+  void StartGatheringMetrics();
 
-  // Callback from InitTaskGetHardwareClass() that continues the init task by
-  // loading plugin information.
-  void OnInitTaskGotHardwareClass(const std::string& hardware_class);
+  // Callback that continues the init task by loading plugin information.
+  void OnInitTaskGotHardwareClass();
 
   // Called after the Plugin init task has been completed that continues the
   // init task by launching a task to gather Google Update statistics.
@@ -443,12 +440,6 @@ class MetricsService
   // Whether the initial stability log has been recorded during startup.
   bool has_initial_stability_log_;
 
-  // Chrome OS hardware class (e.g., hardware qualification ID). This
-  // class identifies the configured system components such as CPU,
-  // WiFi adapter, etc.  For non Chrome OS hosts, this will be an
-  // empty string.
-  std::string hardware_class_;
-
 #if defined(ENABLE_PLUGINS)
   PluginMetricsProvider* plugin_metrics_provider_;
 #endif