Add a way to specify different source urls for the component updater

chrome/browser/component_updater/component_updater_configurator.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/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 const int kDelayOneHour = kDelayOneMinute * 60;
 
 // Debug values you can pass to --component-updater-debug=value1,value2.
 // Speed up component checking.
 const char kDebugFastUpdate[] = "fast-update";
 // Force out-of-process-xml parsing.
 const char kDebugOutOfProcess[] = "out-of-process";
 // Add "testrequest=1" parameter to the update check query.
 const char kDebugRequestParam[] = "test-request";
 
+// The urls from which an update manifest can be fetched.
+const char* kUrlSources[] = {
+  "http://clients2.google.com/service/update2/crx",       // BANDAID
+  "http://omaha.google.com/service/update2/crx",          // CWS_PUBLIC
+  "http://omaha.sandbox.google.com/service/update2/crx"   // CWS_SANDBOX
+};
+
 bool HasDebugValue(const std::vector<std::string>& vec, const char* test) {
   if (vec.empty())
     return 0;
   return (std::find(vec.begin(), vec.end(), test) != vec.end());
 }
 
 // The request extra information is the OS and architecture, this helps
 // the server select the right package to be delivered.
 const char kExtraInfo[] =
 #if defined(OS_MACOSX)
@@ skipping 56 matching lines @@
  public:
   ChromeConfigurator(const CommandLine* cmdline,
                      net::URLRequestContextGetter* url_request_getter);
 
   virtual ~ChromeConfigurator() {}
 
   virtual int InitialDelay() OVERRIDE;
   virtual int NextCheckDelay() OVERRIDE;
   virtual int StepDelay() OVERRIDE;
   virtual int MinimumReCheckWait() OVERRIDE;
-  virtual GURL UpdateUrl() OVERRIDE;
+  virtual GURL UpdateUrl(CrxComponent::UrlSource source) OVERRIDE;
   virtual const char* ExtraRequestParams() OVERRIDE;
   virtual size_t UrlSizeLimit() OVERRIDE;
   virtual net::URLRequestContextGetter* RequestContext() OVERRIDE;
   virtual bool InProcess() OVERRIDE;
   virtual void OnEvent(Events event, int val) OVERRIDE;
 
  private:
   net::URLRequestContextGetter* url_request_getter_;
   std::string extra_info_;
   bool fast_update_;
   bool out_of_process_;
-  GURL app_update_url_;
 };
 
 ChromeConfigurator::ChromeConfigurator(const CommandLine* cmdline,
     net::URLRequestContextGetter* url_request_getter)
       : url_request_getter_(url_request_getter),
         extra_info_(kExtraInfo) {
   // Parse comma-delimited debug flags.
   std::vector<std::string> debug_values;
   Tokenize(cmdline->GetSwitchValueASCII(switches::kComponentUpdaterDebug),
       ",", &debug_values);
   fast_update_ = HasDebugValue(debug_values, kDebugFastUpdate);
   out_of_process_ = HasDebugValue(debug_values, kDebugOutOfProcess);
 
-  // Allow switch to override update URL (piggyback on AppsGalleryUpdateURL).
-  if (cmdline->HasSwitch(switches::kAppsGalleryUpdateURL)) {
-    app_update_url_ =
-        GURL(cmdline->GetSwitchValueASCII(switches::kAppsGalleryUpdateURL));
-  } else {
-    app_update_url_ = GURL("http://clients2.google.com/service/update2/crx");
-  }
-
   // Make the extra request params, they are necessary so omaha does
   // not deliver components that are going to be rejected at install time.
   extra_info_ += chrome::VersionInfo().Version();
 #if defined(OS_WIN)
   if (base::win::OSInfo::GetInstance()->wow64_status() ==
       base::win::OSInfo::WOW64_ENABLED)
     extra_info_ += "&wow64=1";
 #endif
   if (HasDebugValue(debug_values, kDebugRequestParam))
     extra_info_ += "&testrequest=1";
 }
 
 int ChromeConfigurator::InitialDelay() {
   return  fast_update_ ? 1 : (6 * kDelayOneMinute);
 }
 
 int ChromeConfigurator::NextCheckDelay() {
   return fast_update_ ? 3 : (2 * kDelayOneHour);
 }
 
 int ChromeConfigurator::StepDelay() {
   return fast_update_ ? 1 : 4;
 }
 
 int ChromeConfigurator::MinimumReCheckWait() {
   return fast_update_ ? 30 : (6 * kDelayOneHour);
 }
 
-GURL ChromeConfigurator::UpdateUrl() {
-  return app_update_url_;
+GURL ChromeConfigurator::UpdateUrl(CrxComponent::UrlSource source) {
+  return GURL(kUrlSources[source]);
 }
 
 const char* ChromeConfigurator::ExtraRequestParams() {
   return extra_info_.c_str();
 }
 
 size_t ChromeConfigurator::UrlSizeLimit() {
   return 1024ul;
 }
 
@@ skipping 28 matching lines @@
     default:
       NOTREACHED();
       break;
   }
 }
 
 ComponentUpdateService::Configurator* MakeChromeComponentUpdaterConfigurator(
     const CommandLine* cmdline, net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }