Rename omaha_client and similar tokens to update_client in all contexts.

components/update_client/update_query_params.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/omaha_client/omaha_query_params.h"
+#include "components/update_client/update_query_params.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
-#include "components/omaha_client/omaha_query_params_delegate.h"
+#include "components/update_client/update_query_params_delegate.h"
 
-namespace omaha_client {
+namespace update_client {
 
 namespace {
 
 const char kUnknown[] = "unknown";
 
 // The request extra information is the OS and architecture, this helps
 // the server select the right package to be delivered.
 const char kOs[] =
 #if defined(OS_MACOSX)
     "mac";
@@ skipping 27 matching lines @@
 #endif
 
 const char kChrome[] = "chrome";
 
 #if defined(GOOGLE_CHROME_BUILD)
 const char kChromeCrx[] = "chromecrx";
 #else
 const char kChromiumCrx[] = "chromiumcrx";
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
-OmahaQueryParamsDelegate* g_delegate = NULL;
+UpdateQueryParamsDelegate* g_delegate = NULL;
 
 }  // namespace
 
 // static
-std::string OmahaQueryParams::Get(ProdId prod) {
+std::string UpdateQueryParams::Get(ProdId prod) {
   return base::StringPrintf(
-      "os=%s&arch=%s&nacl_arch=%s&prod=%s%s",
-      kOs,
-      kArch,
-      GetNaclArch(),
+      "os=%s&arch=%s&nacl_arch=%s&prod=%s%s", kOs, kArch, GetNaclArch(),
       GetProdIdString(prod),
       g_delegate ? g_delegate->GetExtraParams().c_str() : "");
 }
 
 // static
-const char* OmahaQueryParams::GetProdIdString(OmahaQueryParams::ProdId prod) {
+const char* UpdateQueryParams::GetProdIdString(UpdateQueryParams::ProdId prod) {
   switch (prod) {
-    case OmahaQueryParams::CHROME:
+    case UpdateQueryParams::CHROME:
       return kChrome;
       break;
-    case OmahaQueryParams::CRX:
+    case UpdateQueryParams::CRX:
 #if defined(GOOGLE_CHROME_BUILD)
       return kChromeCrx;
 #else
       return kChromiumCrx;
 #endif
       break;
   }
   return kUnknown;
 }
 
 // static
-const char* OmahaQueryParams::GetOS() {
+const char* UpdateQueryParams::GetOS() {
   return kOs;
 }
 
 // static
-const char* OmahaQueryParams::GetArch() {
+const char* UpdateQueryParams::GetArch() {
   return kArch;
 }
 
 // static
-const char* OmahaQueryParams::GetNaclArch() {
+const char* UpdateQueryParams::GetNaclArch() {
 #if defined(ARCH_CPU_X86_FAMILY)
 #if defined(ARCH_CPU_X86_64)
   return "x86-64";
 #elif defined(OS_WIN)
   bool x86_64 = (base::win::OSInfo::GetInstance()->wow64_status() ==
                  base::win::OSInfo::WOW64_ENABLED);
   return x86_64 ? "x86-64" : "x86-32";
 #else
   return "x86-32";
 #endif
 #elif defined(ARCH_CPU_ARMEL)
   return "arm";
 #elif defined(ARCH_CPU_ARM64)
   return "arm64";
 #elif defined(ARCH_CPU_MIPSEL)
   return "mips32";
 #else
 // NOTE: when adding new values here, please remember to update the
 // comment in the .h file about possible return values from this function.
 #error "You need to add support for your architecture here"
 #endif
 }
 
 // static
-void OmahaQueryParams::SetDelegate(OmahaQueryParamsDelegate* delegate) {
+void UpdateQueryParams::SetDelegate(UpdateQueryParamsDelegate* delegate) {
   DCHECK(!g_delegate || !delegate);
   g_delegate = delegate;
 }
 
-}  // namespace omaha_client
+}  // namespace update_client