Componentize component_updater: Move some paths/constants to component.

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 ec6d497ac329fb6931331ece0c8b9d7bd091207c..106ef19a9aba851899a19e75de4af023f2344b1e 100644
--- a/chrome/browser/component_updater/component_updater_utils.cc
+++ b/chrome/browser/component_updater/component_updater_utils.cc
@@ -14,11 +14,11 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
+#include "base/version.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/crx_update_item.h"
 #include "chrome/browser/omaha_query_params/omaha_query_params.h"
-#include "chrome/common/chrome_version_info.h"
 #include "extensions/common/extension.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
@@ -38,12 +38,12 @@ int GetPhysicalMemoryGB() {
 
 }  // namespace
 
-std::string BuildProtocolRequest(const std::string& request_body,
+std::string BuildProtocolRequest(const std::string& application_version,
+                                 const std::string& platform_name,
+                                 const std::string& request_body,
                                  const std::string& additional_attributes) {
   const std::string prod_id(chrome::OmahaQueryParams::GetProdIdString(
       chrome::OmahaQueryParams::CHROME));
-  const chrome::VersionInfo chrome_version_info;
-  const std::string chrome_version(chrome_version_info.Version());
 
   std::string request(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -59,8 +59,8 @@ std::string BuildProtocolRequest(const std::string& request_body,
       "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"
+      application_version.c_str(),                   // "version"
+      application_version.c_str(),                   // "prodversion"
       base::GenerateGUID().c_str(),                  // "requestid"
       chrome::OmahaQueryParams::GetLang(),           // "lang",
       chrome::OmahaQueryParams::GetChannelString(),  // "updaterchannel"
@@ -85,7 +85,7 @@ std::string BuildProtocolRequest(const std::string& request_body,
   base::StringAppendF(
       &request,
       "<os platform=\"%s\" version=\"%s\" arch=\"%s\"/>",
-      chrome::VersionInfo().OSType().c_str(),                  // "platform"
+      platform_name.c_str(),                                   // "platform"
       base::SysInfo().OperatingSystemVersion().c_str(),        // "version"
       base::SysInfo().OperatingSystemArchitecture().c_str());  // "arch"