Add function to CancelableTaskTracker and convert BootTimeLoader

chrome/browser/chromeos/login/version_info_updater.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_VERSION_INFO_UPDATER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_VERSION_INFO_UPDATER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/boot_times_loader.h"
@@ skipping 57 matching lines @@
   void UpdateEnterpriseInfo();
 
   // Set enterprise domain name.
   void SetEnterpriseInfo(const std::string& domain_name,
                          const std::string& status_text,
                          bool reporting_hint);
 
   // Callback from chromeos::VersionLoader giving the version.
   void OnVersion(const std::string& version);
   // Callback from chromeos::InfoLoader giving the boot times.
-  void OnBootTimes(
-      BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times);
+  void OnBootTimes(const BootTimesLoader::BootTimes& boot_times);
   // Null callback from chromeos::InfoLoader.
-  void OnBootTimesNoop(
-      BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times);
+  void OnBootTimesNoop(const BootTimesLoader::BootTimes& boot_times);
 
   // Handles asynchronously loading the version.
   VersionLoader version_loader_;
   // Used to request the version.
-  CancelableTaskTracker tracker_;
+  CancelableRequestConsumer version_consumer_;
 
   // Handles asynchronously loading the boot times.
   BootTimesLoader boot_times_loader_;
-  // Used to request the boot times.
-  CancelableRequestConsumer boot_times_consumer_;
+  // Used to request boot times.
+  CancelableTaskTracker tracker_;
 
   // Information pieces for version label.
   std::string version_text_;
   std::string enterprise_domain_text_;
   std::string enterprise_status_text_;
   bool enterprise_reporting_hint_;
 
   // Full text for the OS version label.
   std::string os_version_label_text_;
 
   // CloudPolicySubsysterm observer registrar
   scoped_ptr<policy::CloudPolicySubsystem::ObserverRegistrar>
       cloud_policy_registrar_;
 
   chromeos::CrosSettings* cros_settings_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(VersionInfoUpdater);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_VERSION_INFO_UPDATER_H_