Decouple loading of channel info and the rest of machine statistics.

chrome/browser/chromeos/system/statistics_provider.cc

Index: chrome/browser/chromeos/system/statistics_provider.cc
diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc
index 29db4593f6969efbd3b114b85137be05d2d3e9c0..3db7522e377776ed24ed65574e546efb561feba6 100644
--- a/chrome/browser/chromeos/system/statistics_provider.cc
+++ b/chrome/browser/chromeos/system/statistics_provider.cc
@@ -71,6 +71,7 @@ class StatisticsProviderImpl : public StatisticsProvider {
  public:
   // StatisticsProvider implementation:
   virtual void Init() OVERRIDE;
+  virtual void StartLoadingMachineStatistics() OVERRIDE;
   virtual bool GetMachineStatistic(const std::string& name,
                                    std::string* result) OVERRIDE;
 
@@ -88,9 +89,6 @@ class StatisticsProviderImpl : public StatisticsProvider {
   // info file immediately.
   void LoadMachineOSInfoFile();
 
-  // Starts loading the machine statistcs.
-  void StartLoadingMachineStatistics();
-
   // Loads the machine statistcs by examining the system.
   void LoadMachineStatistics();
 
@@ -105,10 +103,8 @@ void StatisticsProviderImpl::Init() {
   DCHECK(!initialized_);
   initialized_ = true;
 
-  // Load the machine info file immediately to get the channel info and delay
-  // loading the remaining statistics.
+  // Load the machine info file immediately to get the channel info.
   LoadMachineOSInfoFile();
-  StartLoadingMachineStatistics();
 }
 
 bool StatisticsProviderImpl::GetMachineStatistic(
@@ -219,8 +215,9 @@ StatisticsProviderImpl* StatisticsProviderImpl::GetInstance() {
 class StatisticsProviderStubImpl : public StatisticsProvider {
  public:
   // StatisticsProvider implementation:
-  virtual void Init() OVERRIDE {
-  }
+  virtual void Init() OVERRIDE {}
+
+  virtual void StartLoadingMachineStatistics() OVERRIDE {}
 
   virtual bool GetMachineStatistic(const std::string& name,
                                    std::string* result) OVERRIDE {