Ensure that GetBootTimes is always called, since it updates histograms

chrome/browser/chromeos/login/version_info_updater.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
 }
 
 void VersionInfoUpdater::StartUpdate(bool is_official_build) {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     version_loader_.GetVersion(
         &version_consumer_,
         base::Bind(&VersionInfoUpdater::OnVersion, base::Unretained(this)),
         is_official_build ?
             VersionLoader::VERSION_SHORT_WITH_DATE :
             VersionLoader::VERSION_FULL);
-    if (!is_official_build) {
-      boot_times_loader_.GetBootTimes(
-          &boot_times_consumer_,
-          NewCallback(this, &VersionInfoUpdater::OnBootTimes));
-    }
+    boot_times_loader_.GetBootTimes(
+        &boot_times_consumer_,
+        NewCallback(this, is_official_build ?
+            &VersionInfoUpdater::OnBootTimesNoop :
+            &VersionInfoUpdater::OnBootTimes));

[jrbarnette, 2011/11/09 23:54:03]

It would help to have a comment here mentioning that GetBootTimes
reports statistics to UMA, so that no one need wonder why there's
a no-op callback, and so that the next developer who breaks this won't
be able to claim "I didn't know that was needed" :-).

   } 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 91 matching lines @@
     UpdateVersionLabel();
   }
 }
 
 void VersionInfoUpdater::OnVersion(
     VersionLoader::Handle handle, std::string version) {
   version_text_.swap(version);
   UpdateVersionLabel();
 }
 
+void VersionInfoUpdater::OnBootTimesNoop(
+    BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) {
+}
+
 void VersionInfoUpdater::OnBootTimes(
     BootTimesLoader::Handle handle, 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) {
@@ skipping 17 matching lines @@
     delegate_->OnBootTimesLabelTextUpdated(boot_times_text);
 }
 
 void VersionInfoUpdater::OnPolicyStateChanged(
     policy::CloudPolicySubsystem::PolicySubsystemState state,
     policy::CloudPolicySubsystem::ErrorDetails error_details) {
   UpdateEnterpriseInfo();
 }
 
 }  // namespace chromeos