Added asynchronous notification of readiness to the StatisticsProvider, and

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 229921de4fbdfaf848b283a4bde64ce88dd34495..b57318840775fef9dd20fe9563d0d76ac8da025c 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -152,14 +152,12 @@ class MetricsService : public content::NotificationObserver,
     NEED_TO_SHUTDOWN = ~CLEANLY_SHUTDOWN
   };
 
-  // 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);
-
-  // Callback from InitTaskGetHardwareClass() that continues the init task by
-  // loading plugin information.
-  void OnInitTaskGotHardwareClass(const std::string& hardware_class);
+  // Callback for the StatisticsProvider to signal that hardware data has been
+  // loaded. Retrieves the hardware class and stores it in hardware_class_.
+  void OnStatisticsProviderReady();
+
+  // First part of the init task that starts loading plugin info asynchronously.
+  void InitTaskGetPluginInfo();
 
   // Callback from PluginService::GetPlugins() that moves the state to
   // INIT_TASK_DONE.