Componentize component_updater: Move some paths/constants to component.

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/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"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 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,
+std::string BuildProtocolRequest(const std::string& chrome_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\"?>"
       "<request protocol=\"3.0\" ");
 
   if (!additional_attributes.empty())
     base::StringAppendF(&request, "%s ", additional_attributes.c_str());
 
   // Chrome version and platform information.
   base::StringAppendF(
@@ skipping 21 matching lines @@
 
   // HW platform information.
   base::StringAppendF(&request,
                       "<hw physmemory=\"%d\"/>",
                       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"
+      platform_name.c_str(),                                   // "platform"
       base::SysInfo().OperatingSystemVersion().c_str(),        // "version"
       base::SysInfo().OperatingSystemArchitecture().c_str());  // "arch"
 
   // The actual payload of the request.
   base::StringAppendF(&request, "%s</request>", request_body.c_str());
 
   return request;
 }
 
 net::URLFetcher* SendProtocolRequest(
@@ skipping 82 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