Implement support for fallback update check urls in the component updater

chrome/browser/component_updater/chrome_component_updater_configurator.cc

 // Copyright 2014 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/component_updater/chrome_component_updater_configurator.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
 const char kSwitchRequestParam[] = "test-request";
 
 // Disables pings. Pings are the requests sent to the update server that report
 // the success or the failure of component install or update attempts.
 extern const char kSwitchDisablePings[] = "disable-pings";
 
 // Sets the URL for updates.
 const char kSwitchUrlSource[] = "url-source";
 
 #define COMPONENT_UPDATER_SERVICE_ENDPOINT \
   "//clients2.google.com/service/update2"

[waffles, 2014/09/12 22:38:26]

Is there any point in having this #define anymore? (It's fine with me if see a
reason to keep it.)

[Sorin Jianu, 2014/09/12 23:24:00]

yes.

 
-// The default url for the v3 protocol service endpoint. Can be
-// overridden with --component-updater=url-source=someurl.
+// The default url for the v3 protocol service endpoint.
+// The value of |kDefaultUrlSource| can be overridden with
+// --component-updater=url-source=someurl.
 const char kDefaultUrlSource[] = "https:" COMPONENT_UPDATER_SERVICE_ENDPOINT;
 
-// The url to send the pings to.
-const char kPingUrl[] = "https:" COMPONENT_UPDATER_SERVICE_ENDPOINT;
-
 // Disables differential updates.
 const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
 
 #if defined(OS_WIN)
 // Disables background downloads.
 const char kSwitchDisableBackgroundDownloads[] = "disable-background-downloads";
 #endif  // defined(OS_WIN)
 
 // Returns true if and only if |test| is contained in |vec|.
 bool HasSwitchValue(const std::vector<std::string>& vec, const char* test) {
@@ skipping 29 matching lines @@
                      net::URLRequestContextGetter* url_request_getter);
 
   virtual ~ChromeConfigurator() {}
 
   virtual int InitialDelay() const OVERRIDE;
   virtual int NextCheckDelay() OVERRIDE;
   virtual int StepDelay() const OVERRIDE;
   virtual int StepDelayMedium() OVERRIDE;
   virtual int MinimumReCheckWait() const OVERRIDE;
   virtual int OnDemandDelay() const OVERRIDE;
-  virtual GURL UpdateUrl() const OVERRIDE;
-  virtual GURL PingUrl() const OVERRIDE;
+  virtual std::vector<GURL> UpdateUrl() const OVERRIDE;
+  virtual std::vector<GURL> PingUrl() const OVERRIDE;
   virtual base::Version GetBrowserVersion() const OVERRIDE;
   virtual std::string GetChannel() const OVERRIDE;
   virtual std::string GetLang() const OVERRIDE;
   virtual std::string GetOSLongName() const OVERRIDE;
   virtual std::string ExtraRequestParams() const OVERRIDE;
   virtual size_t UrlSizeLimit() const OVERRIDE;
   virtual net::URLRequestContextGetter* RequestContext() const OVERRIDE;
   virtual scoped_refptr<OutOfProcessPatcher> CreateOutOfProcessPatcher()
       const OVERRIDE;
   virtual bool DeltasEnabled() const OVERRIDE;
   virtual bool UseBackgroundDownloader() const OVERRIDE;
   virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
       const OVERRIDE;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
       GetSingleThreadTaskRunner() const OVERRIDE;
 
  private:
   net::URLRequestContextGetter* url_request_getter_;
   std::string extra_info_;
-  std::string url_source_;
+  GURL url_source_override_;
   bool fast_update_;
   bool pings_enabled_;
   bool deltas_enabled_;
   bool background_downloads_enabled_;
 };
 
 ChromeConfigurator::ChromeConfigurator(
     const CommandLine* cmdline,
     net::URLRequestContextGetter* url_request_getter)
     : url_request_getter_(url_request_getter),
@@ skipping 10 matching lines @@
   pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings);
   deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates);
 
 #if defined(OS_WIN)
   background_downloads_enabled_ =
       !HasSwitchValue(switch_values, kSwitchDisableBackgroundDownloads);
 #else
   background_downloads_enabled_ = false;
 #endif
 
-  url_source_ = GetSwitchArgument(switch_values, kSwitchUrlSource);
-  if (url_source_.empty()) {
-    url_source_ = kDefaultUrlSource;
-  }
+  url_source_override_ =
+      GURL(GetSwitchArgument(switch_values, kSwitchUrlSource));
+  DCHECK(url_source_override_.is_valid());
 
   if (HasSwitchValue(switch_values, kSwitchRequestParam))
     extra_info_ += "testrequest=\"1\"";
 }
 
 int ChromeConfigurator::InitialDelay() const {
   return fast_update_ ? 1 : (6 * kDelayOneMinute);
 }
 
 int ChromeConfigurator::NextCheckDelay() {
   return fast_update_ ? 3 : (6 * kDelayOneHour);
 }
 
 int ChromeConfigurator::StepDelayMedium() {
   return fast_update_ ? 3 : (15 * kDelayOneMinute);
 }
 
 int ChromeConfigurator::StepDelay() const {
   return fast_update_ ? 1 : 1;
 }
 
 int ChromeConfigurator::MinimumReCheckWait() const {
   return fast_update_ ? 30 : (6 * kDelayOneHour);
 }
 
 int ChromeConfigurator::OnDemandDelay() const {
   return fast_update_ ? 2 : (30 * kDelayOneMinute);
 }
 
-GURL ChromeConfigurator::UpdateUrl() const {
-  return GURL(url_source_);
+std::vector<GURL> ChromeConfigurator::UpdateUrl() const {
+  std::vector<GURL> urls;
+  if (url_source_override_.is_valid()) {
+    urls.push_back(GURL(url_source_override_));
+  } else {
+    urls.push_back(GURL(kDefaultUrlSource));
+  }
+  return urls;
 }
 
-GURL ChromeConfigurator::PingUrl() const {
-  return pings_enabled_ ? GURL(kPingUrl) : GURL();
+std::vector<GURL> ChromeConfigurator::PingUrl() const {
+  return pings_enabled_ ? UpdateUrl() : std::vector<GURL>();
 }
 
 base::Version ChromeConfigurator::GetBrowserVersion() const {
   return base::Version(chrome::VersionInfo().Version());
 }
 
 std::string ChromeConfigurator::GetChannel() const {
   return ChromeOmahaQueryParamsDelegate::GetChannelString();
 }
 
@@ skipping 46 matching lines @@
 
 }  // namespace
 
 Configurator* MakeChromeComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
     net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }
 
 }  // namespace component_updater