Move most of the component updater artifacts to update_client.

components/update_client/utils.cc

 // Copyright 2014 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 "components/component_updater/component_updater_utils.h"
+#include "components/update_client/utils.h"
 
 #include <stdint.h>
 #include <cmath>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.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 "components/component_updater/component_updater_configurator.h"
-#include "components/component_updater/crx_update_item.h"
 #include "components/crx_file/id_util.h"
+#include "components/update_client/configurator.h"
+#include "components/update_client/crx_update_item.h"
+#include "components/update_client/update_client.h"
 #include "components/update_client/update_query_params.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 update_client::UpdateQueryParams;
-
-namespace component_updater {
+namespace update_client {
 
 namespace {
 
 // Returns the amount of physical memory in GB, rounded to the nearest GB.
 int GetPhysicalMemoryGB() {
   const double kOneGB = 1024 * 1024 * 1024;
   const int64_t phys_mem = base::SysInfo::AmountOfPhysicalMemory();
   return static_cast<int>(std::floor(0.5 + phys_mem / kOneGB));
 }
 
@@ skipping 52 matching lines @@
       UpdateQueryParams::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,
-                      "<hw physmemory=\"%d\"/>",
+  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\"/>",
+      &request, "<os platform=\"%s\" version=\"%s\" arch=\"%s\"/>",
       os_long_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;
 }
 
@@ skipping 67 matching lines @@
   return base::DeleteFile(dirname, false);
 }
 
 std::string GetCrxComponentID(const CrxComponent& component) {
   const size_t kCrxIdSize = 16;
   CHECK_GE(component.pk_hash.size(), kCrxIdSize);
   return HexStringToID(base::StringToLowerASCII(
       base::HexEncode(&component.pk_hash[0], kCrxIdSize)));
 }
 
-}  // namespace component_updater
+}  // namespace update_client