Rename omaha_client and similar tokens to update_client in all contexts.

components/component_updater/component_updater_utils.cc

Index: components/component_updater/component_updater_utils.cc
diff --git a/components/component_updater/component_updater_utils.cc b/components/component_updater/component_updater_utils.cc
index 4bd8c5545efd9d7c8128d8db2567ea5fd25fd5cb..56e33ac0118ed759a3d1449a2e95b3b16c37dab2 100644
--- a/components/component_updater/component_updater_utils.cc
+++ b/components/component_updater/component_updater_utils.cc
@@ -19,13 +19,13 @@
 #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/omaha_client/omaha_query_params.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 omaha_client::OmahaQueryParams;
+using update_client::UpdateQueryParams;
 
 namespace component_updater {
 
@@ -66,7 +66,7 @@ std::string BuildProtocolRequest(const std::string& browser_version,
                                  const std::string& request_body,
                                  const std::string& additional_attributes) {
   const std::string prod_id(
-      OmahaQueryParams::GetProdIdString(OmahaQueryParams::CHROME));
+      UpdateQueryParams::GetProdIdString(UpdateQueryParams::CHROME));
 
   std::string request(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -82,15 +82,15 @@ std::string BuildProtocolRequest(const std::string& browser_version,
       "requestid=\"{%s}\" lang=\"%s\" updaterchannel=\"%s\" prodchannel=\"%s\" "
       "os=\"%s\" arch=\"%s\" nacl_arch=\"%s\"",
       prod_id.c_str(),
-      browser_version.c_str(),           // "version"
-      browser_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"
+      browser_version.c_str(),            // "version"
+      browser_version.c_str(),            // "prodversion"
+      base::GenerateGUID().c_str(),       // "requestid"
+      lang.c_str(),                       // "lang",
+      channel.c_str(),                    // "updaterchannel"
+      channel.c_str(),                    // "prodchannel"
+      UpdateQueryParams::GetOS(),         // "os"
+      UpdateQueryParams::GetArch(),       // "arch"
+      UpdateQueryParams::GetNaclArch());  // "nacl_arch"
 #if defined(OS_WIN)
   const bool is_wow64(base::win::OSInfo::GetInstance()->wow64_status() ==
                       base::win::OSInfo::WOW64_ENABLED);