Change the frequency of update checks depending on the installed channel of chrome.

chrome/browser/upgrade_detector.cc

 // Copyright (c) 2010 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/upgrade_detector.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/task.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/cocoa/keystone_glue.h"
 #elif defined(OS_POSIX)
 #include "base/process_util.h"
 #include "chrome/installer/util/version.h"
 #endif
 
 namespace {
 
 // How often to check for an upgrade.
-// TODO(finnur): Once we have a good way of determining which branch the user
-// is on at runtime we should check more frequently for the dev branch.
-const int kCheckForUpgradeEveryMs = 24 * 60 * 60 * 1000;  // Check daily.
+int GetCheckForUpgradeEveryMs() {
+  // Check for a value passed via the command line.
+  int interval_ms;
+  const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+  std::string interval =
+      cmd_line.GetSwitchValueASCII(switches::kCheckForUpdateIntervalSec);
+  if (!interval.empty() && base::StringToInt(interval, &interval_ms))
+    return interval_ms * 1000; // Command line value is in seconds.
+
+  // Otherwise check once an hour for dev channel and once a day for all other
+  // channels/builds.
+  const std::string channel = platform_util::GetVersionStringModifier();
+  int hours;
+  if (channel == "dev")
+    hours = 1;
+  else
+    hours = 24;
+
+  return hours * 60 * 60 * 1000;
+}
 
 // How long to wait before notifying the user about the upgrade.
 const int kNotifyUserAfterMs = 0;
 
 // The thread to run the upgrade detection code on. We use FILE for Linux
 // because we don't want to block the UI thread while launching a background
 // process and reading its output; on the Mac, checking for an upgrade
 // requires reading a file.
 const ChromeThread::ID kDetectUpgradeTaskID =
 #if defined(OS_POSIX)
@@ skipping 90 matching lines @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       notify_upgrade_(false) {
   // Windows: only enable upgrade notifications for official builds.
   // Mac: only enable them if the updater (Keystone) is present.
   // Linux (and other POSIX): always enable regardless of branding.
 #if (defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)) || defined(OS_POSIX)
 #if defined(OS_MACOSX)
   if (keystone_glue::KeystoneEnabled())
 #endif
   {
-    int interval_ms = kCheckForUpgradeEveryMs;
-    const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
-    std::string interval =
-        cmd_line.GetSwitchValueASCII(switches::kCheckForUpdateIntervalSec);
-    if (!interval.empty() && base::StringToInt(interval, &interval_ms))
-      interval_ms *= 1000;  // Command line value is in seconds.
-
     detect_upgrade_timer_.Start(
-        base::TimeDelta::FromMilliseconds(interval_ms),
+        base::TimeDelta::FromMilliseconds(GetCheckForUpgradeEveryMs()),
         this, &UpgradeDetector::CheckForUpgrade);
   }
 #endif
 }
 
 UpgradeDetector::~UpgradeDetector() {
 }
 
 void UpgradeDetector::CheckForUpgrade() {
   method_factory_.RevokeAll();
@@ skipping 21 matching lines @@
 }
 
 void UpgradeDetector::NotifyOnUpgrade() {
   notify_upgrade_ = true;
 
   NotificationService::current()->Notify(
       NotificationType::UPGRADE_RECOMMENDED,
       Source<UpgradeDetector>(this),
       NotificationService::NoDetails());
 }