testrequest is ignored. Also added wow64 attribute.

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_configurator.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/component_patcher.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/component_updater/component_patcher_win.h"
 #endif
 
 namespace {
 
 // Default time constants.
 const int kDelayOneMinute = 60;
 const int kDelayOneHour = kDelayOneMinute * 60;
 
 // Debug values you can pass to --component-updater=value1,value2.
 // Speed up component checking.
 const char kSwitchFastUpdate[] = "fast-update";
-// Add "testrequest=1" parameter to the update check query.
+
+// Add "testrequest=1" attribute to the update check request.
 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"
 
@@ skipping 49 matching lines @@
   virtual ~ChromeConfigurator() {}
 
   virtual int InitialDelay() OVERRIDE;
   virtual int NextCheckDelay() OVERRIDE;
   virtual int StepDelay() OVERRIDE;
   virtual int StepDelayMedium() OVERRIDE;
   virtual int MinimumReCheckWait() OVERRIDE;
   virtual int OnDemandDelay() OVERRIDE;
   virtual GURL UpdateUrl() OVERRIDE;
   virtual GURL PingUrl() OVERRIDE;
-  virtual const char* ExtraRequestParams() OVERRIDE;
+  virtual std::string ExtraRequestParams() OVERRIDE;
   virtual size_t UrlSizeLimit() OVERRIDE;
   virtual net::URLRequestContextGetter* RequestContext() OVERRIDE;
   virtual bool InProcess() OVERRIDE;
   virtual ComponentPatcher* CreateComponentPatcher() OVERRIDE;
   virtual bool DeltasEnabled() const OVERRIDE;
   virtual bool UseBackgroundDownloader() const OVERRIDE;
 
  private:
   net::URLRequestContextGetter* url_request_getter_;
   std::string extra_info_;
   std::string url_source_;
   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),
-        extra_info_(chrome::OmahaQueryParams::Get(
-            chrome::OmahaQueryParams::CHROME)),
         fast_update_(false),
         pings_enabled_(false),
         deltas_enabled_(false),
         background_downloads_enabled_(false) {
   // Parse comma-delimited debug flags.
   std::vector<std::string> switch_values;
   Tokenize(cmdline->GetSwitchValueASCII(switches::kComponentUpdater),
       ",", &switch_values);
   fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate);
   pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings);
 #if defined(OS_WIN)
   deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates);
   background_downloads_enabled_ =
       !HasSwitchValue(switch_values, kSwitchDisableBackgroundDownloads);
 #else
   deltas_enabled_ = false;
   background_downloads_enabled_ = false;
 #endif
 
   url_source_ = GetSwitchArgument(switch_values, kSwitchUrlSource);
   if (url_source_.empty()) {
     url_source_ = kDefaultUrlSource;
   }
 
-  // Make the extra request params, they are necessary so omaha does
-  // not deliver components that are going to be rejected at install time.
-#if defined(OS_WIN)
-  if (base::win::OSInfo::GetInstance()->wow64_status() ==
-      base::win::OSInfo::WOW64_ENABLED)
-    extra_info_ += "&wow64=1";
-#endif
   if (HasSwitchValue(switch_values, kSwitchRequestParam))
-    extra_info_ += "&testrequest=1";
+    extra_info_ += "testrequest=\"1\"";
 }
 
 int ChromeConfigurator::InitialDelay() {
   return fast_update_ ? 1 : (6 * kDelayOneMinute);
 }
 
 int ChromeConfigurator::NextCheckDelay() {
   return fast_update_ ? 3 : (2 * kDelayOneHour);
 }
 
@@ skipping 14 matching lines @@
 }
 
 GURL ChromeConfigurator::UpdateUrl() {
   return GURL(url_source_);
 }
 
 GURL ChromeConfigurator::PingUrl() {
   return pings_enabled_ ? GURL(kPingUrl) : GURL();
 }
 
-const char* ChromeConfigurator::ExtraRequestParams() {
-  return extra_info_.c_str();
+std::string ChromeConfigurator::ExtraRequestParams() {
+  return extra_info_;
 }
 
 size_t ChromeConfigurator::UrlSizeLimit() {
   return 1024ul;
 }
 
 net::URLRequestContextGetter* ChromeConfigurator::RequestContext() {
   return url_request_getter_;
 }
 
@@ skipping 14 matching lines @@
 }
 
 bool ChromeConfigurator::UseBackgroundDownloader() const {
   return background_downloads_enabled_;
 }
 
 ComponentUpdateService::Configurator* MakeChromeComponentUpdaterConfigurator(
     const CommandLine* cmdline, net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }