Add function to CancelableTaskTracker and convert BootTimeLoader (take 2)

chrome/browser/chromeos/login/version_info_updater.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/version_info_updater.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 41 matching lines @@
 }
 
 void VersionInfoUpdater::StartUpdate(bool is_official_build) {
   if (base::chromeos::IsRunningOnChromeOS()) {
     version_loader_.GetVersion(
         is_official_build ? VersionLoader::VERSION_SHORT_WITH_DATE
                           : VersionLoader::VERSION_FULL,
         base::Bind(&VersionInfoUpdater::OnVersion, base::Unretained(this)),
         &tracker_);
     boot_times_loader_.GetBootTimes(
-        &boot_times_consumer_,
-        base::Bind(is_official_build ? &VersionInfoUpdater::OnBootTimesNoop :
-                                       &VersionInfoUpdater::OnBootTimes,
-                   base::Unretained(this)));
+        base::Bind(is_official_build ? &VersionInfoUpdater::OnBootTimesNoop
+                                     : &VersionInfoUpdater::OnBootTimes,
+                   base::Unretained(this)),
+        &tracker_);
   } else {
     UpdateVersionLabel();
   }
 
   policy::CloudPolicySubsystem* cloud_policy =
       g_browser_process->browser_policy_connector()->
           device_cloud_policy_subsystem();
   if (cloud_policy) {
     // Two-step reset because we want to construct new ObserverRegistrar after
     // destruction of old ObserverRegistrar to avoid DCHECK violation because
@@ skipping 112 matching lines @@
     }
   }
 }
 
 void VersionInfoUpdater::OnVersion(const std::string& version) {
   version_text_ = version;
   UpdateVersionLabel();
 }
 
 void VersionInfoUpdater::OnBootTimesNoop(
-    BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) {
-}
+    const BootTimesLoader::BootTimes& boot_times) {}
 
 void VersionInfoUpdater::OnBootTimes(
-    BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) {
+    const BootTimesLoader::BootTimes& boot_times) {
   const char* kBootTimesNoChromeExec =
       "Non-firmware boot took %.2f seconds (kernel %.2fs, system %.2fs)";
   const char* kBootTimesChromeExec =
       "Non-firmware boot took %.2f seconds "
       "(kernel %.2fs, system %.2fs, chrome %.2fs)";
   std::string boot_times_text;
 
   if (boot_times.chrome > 0) {
     boot_times_text =
         base::StringPrintf(
@@ skipping 25 matching lines @@
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED)
     UpdateEnterpriseInfo();
   else
     NOTREACHED();
 }
 
 }  // namespace chromeos