Move most of the component updater artifacts to update_client.

components/update_client/utils.cc

Index: components/update_client/utils.cc
diff --git a/components/component_updater/component_updater_utils.cc b/components/update_client/utils.cc
similarity index 93%
rename from components/component_updater/component_updater_utils.cc
rename to components/update_client/utils.cc
index 56e33ac0118ed759a3d1449a2e95b3b16c37dab2..47bb43771e78b6e54e08a24c8114894ab6b98f33 100644
--- a/components/component_updater/component_updater_utils.cc
+++ b/components/update_client/utils.cc
@@ -2,7 +2,7 @@
 // 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>
@@ -16,18 +16,17 @@
 #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 {
 
@@ -100,14 +99,12 @@ std::string BuildProtocolRequest(const std::string& browser_version,
   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"
@@ -195,4 +192,4 @@ std::string GetCrxComponentID(const CrxComponent& component) {
       base::HexEncode(&component.pk_hash[0], kCrxIdSize)));
 }
 
-}  // namespace component_updater
+}  // namespace update_client