testrequest is ignored. Also added wow64 attribute.

chrome/browser/component_updater/component_updater_configurator.cc

Index: chrome/browser/component_updater/component_updater_configurator.cc
diff --git a/chrome/browser/component_updater/component_updater_configurator.cc b/chrome/browser/component_updater/component_updater_configurator.cc
index 1b4e2a984f81dcc7e9fbbd777ea644efb21b9d6d..c7be37d67af7443e2a74dcfc751cbac56241c2c3 100644
--- a/chrome/browser/component_updater/component_updater_configurator.cc
+++ b/chrome/browser/component_updater/component_updater_configurator.cc
@@ -15,7 +15,6 @@
 #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)
@@ -31,8 +30,10 @@ 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";
@@ -102,7 +103,7 @@ class ChromeConfigurator : public ComponentUpdateService::Configurator {
   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;
@@ -123,8 +124,6 @@ class ChromeConfigurator : public ComponentUpdateService::Configurator {
 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),
@@ -149,15 +148,8 @@ ChromeConfigurator::ChromeConfigurator(const CommandLine* cmdline,
     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() {
@@ -192,8 +184,8 @@ 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() {