Move OmahaQueryParams to a component and add a delegate interface.

chrome/browser/component_updater/component_updater_utils.cc

 // Copyright 2013 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_utils.h"
 
 #include <cmath>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #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/crx_update_item.h"
-#include "chrome/browser/omaha_query_params/omaha_query_params.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 {
 
 // Returns the amount of physical memory in GB, rounded to the nearest GB.
 int GetPhysicalMemoryGB() {
   const double kOneGB = 1024 * 1024 * 1024;
   const int64 phys_mem = base::SysInfo::AmountOfPhysicalMemory();
   return static_cast<int>(std::floor(0.5 + phys_mem / kOneGB));
 }
 
 }  // namespace
 
 std::string BuildProtocolRequest(const std::string& request_body,
                                  const std::string& additional_attributes) {
-  const std::string prod_id(chrome::OmahaQueryParams::GetProdIdString(
-      chrome::OmahaQueryParams::CHROME));
+  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\" ");
 
   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"
-      chrome::OmahaQueryParams::GetLang(),           // "lang",
-      chrome::OmahaQueryParams::GetChannelString(),  // "updaterchannel"
-      chrome::OmahaQueryParams::GetChannelString(),  // "prodchannel"
-      chrome::OmahaQueryParams::GetOS(),             // "os"
-      chrome::OmahaQueryParams::GetArch(),           // "arch"
-      chrome::OmahaQueryParams::GetNaclArch());      // "nacl_arch"
+      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, ">");
 
   // HW platform information.
   base::StringAppendF(&request,
@@ skipping 100 matching lines @@
   DCHECK(extensions::Extension::IdIsValid(id));
   return id;
 }
 
 std::string GetCrxComponentID(const CrxComponent& component) {
   return HexStringToID(StringToLowerASCII(
       base::HexEncode(&component.pk_hash[0], component.pk_hash.size() / 2)));
 }
 
 }  // namespace component_updater