Componentize component_updater: Use Configurator to build query parameters.

chrome/browser/component_updater/component_updater_utils.cc

Index: chrome/browser/component_updater/component_updater_utils.cc
diff --git a/chrome/browser/component_updater/component_updater_utils.cc b/chrome/browser/component_updater/component_updater_utils.cc
index d7ff01b49960232503667b7b5248563b40140865..ae49c4ec9624262a176584762c449da0d3c98829 100644
--- a/chrome/browser/component_updater/component_updater_utils.cc
+++ b/chrome/browser/component_updater/component_updater_utils.cc
@@ -14,19 +14,14 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
-#include "base/win/windows_version.h"
+#include "chrome/browser/component_updater/component_updater_configurator.h"
 #include "chrome/browser/component_updater/crx_update_item.h"
-#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
-#include "chrome/common/chrome_version_info.h"
-#include "components/omaha_query_params/omaha_query_params.h"
 #include "extensions/common/extension.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
-using omaha_query_params::OmahaQueryParams;
-
 namespace component_updater {
 
 namespace {
@@ -40,15 +35,9 @@ int GetPhysicalMemoryGB() {
 
 }  // namespace
 
-std::string BuildProtocolRequest(const std::string& request_body,
+std::string BuildProtocolRequest(const Configurator& config,
+                                 const std::string& request_body,
                                  const std::string& additional_attributes) {
-  const std::string prod_id(
-      OmahaQueryParams::GetProdIdString(OmahaQueryParams::CHROME));
-  const chrome::VersionInfo chrome_version_info;
-  const std::string chrome_version(chrome_version_info.Version());
-  const std::string channel(ChromeOmahaQueryParamsDelegate::GetChannelString());
-  const std::string lang(ChromeOmahaQueryParamsDelegate::GetLang());
-
   std::string request(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<request protocol=\"3.0\" ");
@@ -56,28 +45,14 @@ std::string BuildProtocolRequest(const std::string& request_body,
   if (!additional_attributes.empty())
     base::StringAppendF(&request, "%s ", additional_attributes.c_str());
 
-  // Chrome version and platform information.
-  base::StringAppendF(
-      &request,
-      "version=\"%s-%s\" prodversion=\"%s\" "
-      "requestid=\"{%s}\" lang=\"%s\" updaterchannel=\"%s\" prodchannel=\"%s\" "
-      "os=\"%s\" arch=\"%s\" nacl_arch=\"%s\"",
-      prod_id.c_str(),
-      chrome_version.c_str(),            // "version"
-      chrome_version.c_str(),            // "prodversion"
-      base::GenerateGUID().c_str(),      // "requestid"
-      lang.c_str(),                      // "lang",
-      channel.c_str(),                   // "updaterchannel"
-      channel.c_str(),                   // "prodchannel"
-      OmahaQueryParams::GetOS(),         // "os"
-      OmahaQueryParams::GetArch(),       // "arch"
-      OmahaQueryParams::GetNaclArch());  // "nacl_arch"
-#if defined(OS_WIN)
-  const bool is_wow64(base::win::OSInfo::GetInstance()->wow64_status() ==
-                      base::win::OSInfo::WOW64_ENABLED);
-  if (is_wow64)
-    base::StringAppendF(&request, " wow64=\"1\"");
-#endif
+  base::StringAppendF(&request, "requestid=\\\"{%s}\\\" ",
+                      base::GenerateGUID().c_str());      // "requestid"
+
+  if (!config.PlatformRequestParams().empty()) {
+    base::StringAppendF(&request, "%s ",
+                        config.PlatformRequestParams().c_str());
+  }
+
   base::StringAppendF(&request, ">");
 
   // HW platform information.
@@ -86,12 +61,7 @@ std::string BuildProtocolRequest(const std::string& request_body,
                       GetPhysicalMemoryGB());  // "physmem" in GB.
 
   // OS version and platform information.
-  base::StringAppendF(
-      &request,
-      "<os platform=\"%s\" version=\"%s\" arch=\"%s\"/>",
-      chrome::VersionInfo().OSType().c_str(),                  // "platform"
-      base::SysInfo().OperatingSystemVersion().c_str(),        // "version"
-      base::SysInfo().OperatingSystemArchitecture().c_str());  // "arch"
+  base::StringAppendF(&request, "%s", config.RequestOSTag().c_str());
 
   // The actual payload of the request.
   base::StringAppendF(&request, "%s</request>", request_body.c_str());