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..16f4642ba5d96e911545bc30e3ef86416481725d 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -152,10 +152,15 @@ 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);
+  // First part of the init task. Starts retrieving the hardware class and
+  // proceeds to OnInitTaskGotHardwareClass() or waits for
+  // OnStatisticsProviderReady().
+  static void InitTaskGetHardwareClass(base::WeakPtr<MetricsService> self);
+
+  // Callback for the StatisticsProvider to signal that hardware data has been
+  // loaded. Retrieves the hardware class and passes it to
+  // OnInitTaskGotHardwareClass().
+  void OnStatisticsProviderReady();

[Ilya Sherman, 2012/04/19 19:35:32]

nit: This is #ifdef'd in the implementation file, but not here in the header. 
The two should probably be consistent.

[Joao da Silva, 2012/04/19 19:54:33]

Of course, good catch. Done.

 
   // Callback from InitTaskGetHardwareClass() that continues the init task by
   // loading plugin information.