Record histograms for on-demand update check results.

chrome/browser/ui/webui/help/version_updater_win.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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/version.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/google/google_update_win.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/help/version_updater.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 
-using base::UserMetricsAction;
 using content::BrowserThread;
 
 namespace {
 
 // Windows implementation of version update functionality, used by the WebUI
 // About/Help page.
 class VersionUpdaterWin : public VersionUpdater,
                           public GoogleUpdateStatusListener {
  private:
   friend class VersionReader;
@@ skipping 134 matching lines @@
                                      const base::string16& error_message) {
   // For Chromium builds it would show an error message.
   // But it looks weird because in fact there is no error,
   // just the update server is not available for non-official builds.
 #if defined(GOOGLE_CHROME_BUILD)
   Status status = UPDATED;
   base::string16 message;
 
   switch (result) {
     case UPGRADE_CHECK_STARTED: {
-      content::RecordAction(UserMetricsAction("UpgradeCheck_Started"));
       status = CHECKING;
       break;
     }
     case UPGRADE_STARTED: {
-      content::RecordAction(UserMetricsAction("Upgrade_Started"));
       status = UPDATING;
       break;
     }
     case UPGRADE_IS_AVAILABLE: {
-      content::RecordAction(
-          UserMetricsAction("UpgradeCheck_UpgradeIsAvailable"));
       DCHECK(!google_updater_);  // Should have been nulled out already.
       CreateGoogleUpdater();
       UpdateStatus(UPGRADE_STARTED, GOOGLE_UPDATE_NO_ERROR, base::string16());
       // Specify true to upgrade now.
       google_updater_->CheckForUpdate(true, GetElevationParent());
       return;
     }
     case UPGRADE_ALREADY_UP_TO_DATE: {
       // Google Update reported that Chrome is up-to-date.
       // To confirm the updated version is running, the reading
       // must be done on the file thread. The rest of this case
       // will be handled within GotInstalledVersion.
       BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(
             &VersionReader::GetVersionFromFileThread,
             new VersionReader(weak_factory_.GetWeakPtr())));
       return;
     }
     case UPGRADE_SUCCESSFUL: {
-      content::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"));
       status = NEARLY_UPDATED;
       break;
     }
     case UPGRADE_ERROR: {
-      content::RecordAction(UserMetricsAction("UpgradeCheck_Error"));
       status = FAILED;
       if (error_code == GOOGLE_UPDATE_DISABLED_BY_POLICY) {
         message =
             l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY);
       } else if (error_code == GOOGLE_UPDATE_DISABLED_BY_POLICY_AUTO_ONLY) {
         message =
             l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY_MANUAL);
       } else {
         message =
             l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code);
@@ skipping 19 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Make sure that the latest version is running and if not,
   // notify the user by setting the status to NEARLY_UPDATED.
   //
   // The extra version check is necessary on Windows because the application
   // may be already up to date on disk though the running app is still
   // out of date.
   chrome::VersionInfo version_info;
   Version running_version(version_info.Version());
-  if (!version.IsValid() || version.CompareTo(running_version) <= 0) {
-    content::RecordAction(
-        UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
-    callback_.Run(UPDATED, 0, base::string16());
-  } else {
-    content::RecordAction(UserMetricsAction("UpgradeCheck_AlreadyUpgraded"));
-    callback_.Run(NEARLY_UPDATED, 0, base::string16());
-  }
+  Status status =
+      (!version.IsValid() || version.CompareTo(running_version) <= 0)
+          ? UPDATED
+          : NEARLY_UPDATED;

[Peter Kasting, 2014/10/18 03:01:11]

Nit: I think this might be slightly clearer reversed:

  callback_.Run(
      (version.IsValid() && version.CompareTo(running_version) > 0) ?
          NEARLY_UPDATED : UPDATED, 0, base::string16());

[grt (UTC plus 2), 2014/10/18 03:28:52]

Done with formatting courtesy of "git cl format".

+  callback_.Run(status, 0, base::string16());
 }
 
 void VersionUpdaterWin::CreateGoogleUpdater() {
   ClearGoogleUpdater();
   google_updater_ = new GoogleUpdate();
   google_updater_->set_status_listener(this);
 }
 
 void VersionUpdaterWin::ClearGoogleUpdater() {
   if (google_updater_) {
@@ skipping 25 matching lines @@
                          << GetCurrentThreadId();
 #endif
   return window;
 }
 
 }  // namespace
 
 VersionUpdater* VersionUpdater::Create() {
   return new VersionUpdaterWin;
 }