Rename components/omaha_query_params => components/omaha_client

There are some additional bits of Omaha client and test logic
that should be factored out into this component. A rename is
appropriate sooner rather than later.

This CL is strictly a rename; pardon the dust.

BUG=None
R=cpu@chromium.org
TBR=jamescook@chromium.org //e/b/DEPS

Review URL: https://codereview.chromium.org/704703003

Cr-Commit-Position: refs/heads/master@{#304052}

47 files changed, 101 insertions, 102 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 796e932..4726644 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -91,7 +91,7 @@ static_library("browser") {
     "//components/metrics/proto:proto",
     "//components/navigation_metrics",
     "//components/network_time",
-    "//components/omaha_query_params",
+    "//components/omaha_client",
     "//components/omnibox",
     "//components/os_crypt",
     "//components/password_manager/core/browser",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 96f0df4..2410563 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -46,7 +46,7 @@ include_rules = [
   "+components/navigation_interception",
   "+components/navigation_metrics",
   "+components/network_time",
-  "+components/omaha_query_params",
+  "+components/omaha_client",
   "+components/omnibox",
   "+components/os_crypt",
   "+components/password_manager",
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index caeb279..126ce36 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -45,7 +45,7 @@
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
-#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ -76,7 +76,7 @@
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/metrics/metrics_service.h"
 #include "components/network_time/network_time_tracker.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/translate_download_manager.h"
@@ -222,7 +222,7 @@ BrowserProcessImpl::BrowserProcessImpl(
 
   message_center::MessageCenter::Initialize();
 
-  omaha_query_params::OmahaQueryParams::SetDelegate(
+  omaha_client::OmahaQueryParams::SetDelegate(
       ChromeOmahaQueryParamsDelegate::GetInstance());
 }
 
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
index 6bb751dc..5810154 100644
--- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc
+++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
@@ -17,7 +17,7 @@
 #endif  // OS_WIN
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/component_patcher_operation_out_of_process.h"
-#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/component_updater/component_updater_configurator.h"
 #include "components/component_updater/component_updater_switches.h"
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
index 0aeebe7..2bb7518 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
@@ -28,11 +28,11 @@
 #include "chrome/common/chrome_paths.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/nacl/common/nacl_switches.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
-using omaha_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 
 namespace component_updater {
 
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 303c62c..57cf686 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -46,7 +46,7 @@ static_library("extensions") {
     "//chrome/common/safe_browsing:proto",
     "//chrome/installer/util",
     "//components/copresence",
-    "//components/omaha_query_params",
+    "//components/omaha_client",
     "//components/onc",
     "//components/proximity_auth",
     "//components/strings",
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
index 2142e8f..9d9ce57 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/notification_types.h"
@@ -181,7 +181,7 @@ void ChromeRuntimeAPIDelegate::OpenURL(const GURL& uninstall_url) {
 }
 
 bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
-  const char* os = omaha_query_params::OmahaQueryParams::GetOS();
+  const char* os = omaha_client::OmahaQueryParams::GetOS();
   if (strcmp(os, "mac") == 0) {
     info->os = PlatformInfo::OS_MAC_;
   } else if (strcmp(os, "win") == 0) {
@@ -197,7 +197,7 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
     return false;
   }
 
-  const char* arch = omaha_query_params::OmahaQueryParams::GetArch();
+  const char* arch = omaha_client::OmahaQueryParams::GetArch();
   if (strcmp(arch, "arm") == 0) {
     info->arch = PlatformInfo::ARCH_ARM;
   } else if (strcmp(arch, "x86") == 0) {
@@ -209,7 +209,7 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
     return false;
   }
 
-  const char* nacl_arch = omaha_query_params::OmahaQueryParams::GetNaclArch();
+  const char* nacl_arch = omaha_client::OmahaQueryParams::GetNaclArch();
   if (strcmp(nacl_arch, "arm") == 0) {
     info->nacl_arch = PlatformInfo::NACL_ARCH_ARM;
   } else if (strcmp(nacl_arch, "x86-32") == 0) {
diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
index c167c93..36b76dd 100644
--- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
+++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
@@ -11,14 +11,14 @@
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "extensions/browser/updater/extension_downloader.h"
 #include "google_apis/gaia/identity_provider.h"
 
 using extensions::ExtensionDownloader;
 using extensions::ExtensionDownloaderDelegate;
-using omaha_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 
 scoped_ptr<ExtensionDownloader>
 ChromeExtensionDownloaderFactory::CreateForRequestContext(
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
index c3f5cb4..e7d258a 100644
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
@@ -44,7 +44,7 @@ using base::TimeDelta;
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::ExtensionSet;
-using omaha_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 
 typedef extensions::ExtensionDownloaderDelegate::Error Error;
 typedef extensions::ExtensionDownloaderDelegate::PingResult PingResult;
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index e50c426..2997024 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -36,7 +36,7 @@
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/crx_file/id_util.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -76,7 +76,7 @@
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
-using omaha_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 using testing::DoAll;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index c98940c..3c4c867 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -33,7 +33,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/crx_file/id_util.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_save_info.h"
@@ -199,8 +199,8 @@ GURL WebstoreInstaller::GetWebstoreInstallURL(
   std::string url_string = extension_urls::GetWebstoreUpdateUrl().spec();
 
   GURL url(url_string + "?response=redirect&" +
-           omaha_query_params::OmahaQueryParams::Get(
-               omaha_query_params::OmahaQueryParams::CRX) +
+           omaha_client::OmahaQueryParams::Get(
+               omaha_client::OmahaQueryParams::CRX) +
            "&x=" + net::EscapeQueryParamValue(JoinString(params, '&'), true));
   DCHECK(url.is_valid());
 
diff --git a/chrome/browser/extensions/webstore_installer_unittest.cc b/chrome/browser/extensions/webstore_installer_unittest.cc
index a686689..7b2aa59 100644
--- a/chrome/browser/extensions/webstore_installer_unittest.cc
+++ b/chrome/browser/extensions/webstore_installer_unittest.cc
@@ -6,14 +6,14 @@
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/webstore_installer.h"
-#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
 #include "components/crx_file/id_util.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "net/base/escape.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPrintf;
-using omaha_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 
 namespace extensions {
 
diff --git a/chrome/browser/omaha_query_params/OWNERS b/chrome/browser/omaha_client/OWNERS
index c089b54..c089b54 100644
--- a/chrome/browser/omaha_query_params/OWNERS
+++ b/chrome/browser/omaha_client/OWNERS
diff --git a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.cc b/chrome/browser/omaha_client/chrome_omaha_query_params_delegate.cc
index 40d1eed..ef32618 100644
--- a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.cc
+++ b/chrome/browser/omaha_client/chrome_omaha_query_params_delegate.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 "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h b/chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h
index 2f25c65..43f3965 100644
--- a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h
+++ b/chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_OMAHA_QUERY_PARAMS_CHROME_OMAHA_QUERY_PARAMS_DELEGATE_H_
-#define CHROME_BROWSER_OMAHA_QUERY_PARAMS_CHROME_OMAHA_QUERY_PARAMS_DELEGATE_H_
+#ifndef CHROME_BROWSER_OMAHA_CLIENT_CHROME_OMAHA_QUERY_PARAMS_DELEGATE_H_
+#define CHROME_BROWSER_OMAHA_CLIENT_CHROME_OMAHA_QUERY_PARAMS_DELEGATE_H_
 
-#include "components/omaha_query_params/omaha_query_params_delegate.h"
+#include "components/omaha_client/omaha_query_params_delegate.h"
 
 class ChromeOmahaQueryParamsDelegate
-    : public omaha_query_params::OmahaQueryParamsDelegate {
+    : public omaha_client::OmahaQueryParamsDelegate {
  public:
   ChromeOmahaQueryParamsDelegate();
   ~ChromeOmahaQueryParamsDelegate() override;
@@ -16,7 +16,7 @@ class ChromeOmahaQueryParamsDelegate
   // Gets the LazyInstance for ChromeOmahaQueryParamsDelegate.
   static ChromeOmahaQueryParamsDelegate* GetInstance();
 
-  // omaha_query_params::OmahaQueryParamsDelegate:
+  // omaha_client::OmahaQueryParamsDelegate:
   std::string GetExtraParams() override;
 
   // Returns the value we use for the "updaterchannel=" and "prodchannel="
@@ -32,4 +32,4 @@ class ChromeOmahaQueryParamsDelegate
   DISALLOW_COPY_AND_ASSIGN(ChromeOmahaQueryParamsDelegate);
 };
 
-#endif  // CHROME_BROWSER_OMAHA_QUERY_PARAMS_CHROME_OMAHA_QUERY_PARAMS_DELEGATE_H_
+#endif  // CHROME_BROWSER_OMAHA_CLIENT_CHROME_OMAHA_QUERY_PARAMS_DELEGATE_H_
diff --git a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc b/chrome/browser/omaha_client/chrome_omaha_query_params_delegate_unittest.cc
index f35375f..9f3aa13 100644
--- a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
+++ b/chrome/browser/omaha_client/chrome_omaha_query_params_delegate_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
 #include "chrome/common/chrome_version_info.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPrintf;
@@ -18,21 +18,21 @@ bool Contains(const std::string& source, const std::string& target) {
 
 }  // namespace
 
-void TestParams(omaha_query_params::OmahaQueryParams::ProdId prod_id) {
-  std::string params = omaha_query_params::OmahaQueryParams::Get(prod_id);
+void TestParams(omaha_client::OmahaQueryParams::ProdId prod_id) {
+  std::string params = omaha_client::OmahaQueryParams::Get(prod_id);
 
   EXPECT_TRUE(Contains(
       params,
-      StringPrintf("os=%s", omaha_query_params::OmahaQueryParams::GetOS())));
+      StringPrintf("os=%s", omaha_client::OmahaQueryParams::GetOS())));
   EXPECT_TRUE(
       Contains(params,
                StringPrintf("arch=%s",
-                            omaha_query_params::OmahaQueryParams::GetArch())));
+                            omaha_client::OmahaQueryParams::GetArch())));
   EXPECT_TRUE(Contains(
       params,
       StringPrintf(
           "prod=%s",
-          omaha_query_params::OmahaQueryParams::GetProdIdString(prod_id))));
+          omaha_client::OmahaQueryParams::GetProdIdString(prod_id))));
   EXPECT_TRUE(Contains(
       params,
       StringPrintf("prodchannel=%s",
@@ -46,6 +46,6 @@ void TestParams(omaha_query_params::OmahaQueryParams::ProdId prod_id) {
 }
 
 TEST(ChromeOmahaQueryParamsDelegateTest, GetParams) {
-  TestParams(omaha_query_params::OmahaQueryParams::CRX);
-  TestParams(omaha_query_params::OmahaQueryParams::CHROME);
+  TestParams(omaha_client::OmahaQueryParams::CRX);
+  TestParams(omaha_client::OmahaQueryParams::CHROME);
 }
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index dcc96d7..31097fe 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -51,7 +51,7 @@ static_library("ui") {
     "//components/dom_distiller/webui",
     "//components/feedback/proto",
     "//components/invalidation",
-    "//components/omaha_query_params",
+    "//components/omaha_client",
     "//components/onc",
     "//components/password_manager/core/browser",
     "//components/resources",
diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.cc b/chrome/browser/ui/webui/app_list/start_page_handler.cc
index ee15507..ed4f550 100644
--- a/chrome/browser/ui/webui/app_list/start_page_handler.cc
+++ b/chrome/browser/ui/webui/app_list/start_page_handler.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/pref_names.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ -191,7 +191,7 @@ void StartPageHandler::HandleInitialize(const base::ListValue* args) {
           base::Version(kOldHotwordExtensionVersionString)) <= 0) {
     web_ui()->CallJavascriptFunction(
         "appList.startPage.setNaclArch",
-        base::StringValue(omaha_query_params::OmahaQueryParams::GetNaclArch()));
+        base::StringValue(omaha_client::OmahaQueryParams::GetNaclArch()));
   }
 #endif
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2cd9afe..4f7f1f5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -789,8 +789,8 @@
       'browser/net/timed_cache.h',
       'browser/net/url_info.cc',
       'browser/net/url_info.h',
-      'browser/omaha_query_params/chrome_omaha_query_params_delegate.cc',
-      'browser/omaha_query_params/chrome_omaha_query_params_delegate.h',
+      'browser/omaha_client/chrome_omaha_query_params_delegate.cc',
+      'browser/omaha_client/chrome_omaha_query_params_delegate.h',
       'browser/omnibox/omnibox_log.cc',
       'browser/omnibox/omnibox_log.h',
       'browser/password_manager/chrome_password_manager_client.cc',
@@ -2855,7 +2855,7 @@
         '../components/components.gyp:metrics_profiler',
         '../components/components.gyp:navigation_metrics',
         '../components/components.gyp:network_time',
-        '../components/components.gyp:omaha_query_params',
+        '../components/components.gyp:omaha_client',
         '../components/components.gyp:omnibox',
         '../components/components.gyp:os_crypt',
         '../components/components.gyp:password_manager_core_browser',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 273428c..a1e55f1 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -917,7 +917,7 @@
         'installer_util',
         'safe_browsing_proto',
         '../components/components.gyp:copresence',
-        '../components/components.gyp:omaha_query_params',
+        '../components/components.gyp:omaha_client',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:proximity_auth',
         '../components/components.gyp:url_matcher',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c175fb6..19da65a 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2610,7 +2610,7 @@
         '../components/components.gyp:dom_distiller_webui',
         '../components/components.gyp:feedback_proto',
         '../components/components.gyp:invalidation',
-        '../components/components.gyp:omaha_query_params',
+        '../components/components.gyp:omaha_client',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:password_manager_core_browser',
         '../components/components_resources.gyp:components_resources',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 71cd27d..0e958d6 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -564,7 +564,7 @@
       'browser/notifications/message_center_notifications_unittest.cc',
       'browser/notifications/message_center_settings_controller_unittest.cc',
       'browser/notifications/notification_conversion_helper_unittest.cc',
-      'browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc',
+      'browser/omaha_client/chrome_omaha_query_params_delegate_unittest.cc',
       'browser/password_manager/chrome_password_manager_client_unittest.cc',
       'browser/password_manager/native_backend_kwallet_x_unittest.cc',
       'browser/password_manager/password_manager_internals_service_unittest.cc',
diff --git a/chrome/test/base/chrome_unit_test_suite.cc b/chrome/test/base/chrome_unit_test_suite.cc
index 2a886e2..43425767 100644
--- a/chrome/test/base/chrome_unit_test_suite.cc
+++ b/chrome/test/base/chrome_unit_test_suite.cc
@@ -8,13 +8,13 @@
 #include "base/process/process_handle.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_content_browser_client.h"
-#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "components/component_updater/component_updater_paths.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "components/translate/content/browser/browser_cld_data_provider_factory.h"
 #include "components/translate/content/common/cld_data_source.h"
 #include "content/public/common/content_paths.h"
@@ -149,7 +149,7 @@ void ChromeUnitTestSuite::InitializeProviders() {
 
   gfx::GLSurface::InitializeOneOffForTests();
 
-  omaha_query_params::OmahaQueryParams::SetDelegate(
+  omaha_client::OmahaQueryParams::SetDelegate(
       ChromeOmahaQueryParamsDelegate::GetInstance());
 #endif
 }
diff --git a/components/BUILD.gn b/components/BUILD.gn
index ca08f6e..63a9f3e 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -56,7 +56,7 @@ group("all_components") {
     "//components/navigation_interception",
     "//components/navigation_metrics",
     "//components/network_time",
-    "//components/omaha_query_params",
+    "//components/omaha_client",
     "//components/omnibox",
     "//components/onc",
     "//components/os_crypt",
diff --git a/components/component_updater.gypi b/components/component_updater.gypi
index cc2dff2..de423bc 100644
--- a/components/component_updater.gypi
+++ b/components/component_updater.gypi
@@ -17,7 +17,7 @@
         '../net/net.gyp:net',
         '../ui/base/ui_base.gyp:ui_base',
         'crx_file',
-        'omaha_query_params',
+        'omaha_client',
       ],
       'include_dirs': [
         '..',
diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
index a46cf27..c693088 100644
--- a/components/component_updater/BUILD.gn
+++ b/components/component_updater/BUILD.gn
@@ -43,7 +43,7 @@ source_set("component_updater") {
   deps = [
     "//base",
     "//components/crx_file",
-    "//components/omaha_query_params",
+    "//components/omaha_client",
     "//courgette:courgette_lib",
     "//crypto",
     "//third_party/libxml",
diff --git a/components/component_updater/DEPS b/components/component_updater/DEPS
index bee4474..4cd206c 100644
--- a/components/component_updater/DEPS
+++ b/components/component_updater/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+components/crx_file",
-  "+components/omaha_query_params",
+  "+components/omaha_client",
   "+courgette",
   "+crypto",
   "+libxml",
diff --git a/components/component_updater/component_updater_utils.cc b/components/component_updater/component_updater_utils.cc
index a8bcec8..9d00708 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_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_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_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 
 namespace component_updater {
 
diff --git a/components/components.gyp b/components/components.gyp
index f7c6638..f08262a 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -38,7 +38,7 @@
     'metrics.gypi',
     'navigation_metrics.gypi',
     'network_time.gypi',
-    'omaha_query_params.gypi',
+    'omaha_client.gypi',
     'onc.gypi',
     'os_crypt.gypi',
     'ownership.gypi',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 910c6de..af9aa9d 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -165,7 +165,7 @@
             'metrics/profiler/profiler_metrics_provider_unittest.cc',
             'navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
             'network_time/network_time_tracker_unittest.cc',
-            'omaha_query_params/omaha_query_params_unittest.cc',
+            'omaha_client/omaha_query_params_unittest.cc',
             'omnibox/answers_cache_unittest.cc',
             'omnibox/base_search_provider_unittest.cc',
             'omnibox/autocomplete_input_unittest.cc',
@@ -400,8 +400,8 @@
             # Dependencies of network_time
             'components.gyp:network_time',
 
-            # Dependencies of omaha_query_params
-            'components.gyp:omaha_query_params',
+            # Dependencies of omaha_client
+            'components.gyp:omaha_client',
 
             # Dependencies of omnibox
             'components.gyp:omnibox',
diff --git a/components/omaha_query_params.gypi b/components/omaha_client.gypi
index 8994532c..b5b9a7c 100644
--- a/components/omaha_query_params.gypi
+++ b/components/omaha_client.gypi
@@ -5,7 +5,7 @@
 {
   'targets': [
     {
-      'target_name': 'omaha_query_params',
+      'target_name': 'omaha_client',
       'type': 'static_library',
       'include_dirs': [
         '..',
@@ -14,10 +14,10 @@
         '../base/base.gyp:base',
       ],
       'sources': [
-        'omaha_query_params/omaha_query_params.cc',
-        'omaha_query_params/omaha_query_params.h',
-        'omaha_query_params/omaha_query_params_delegate.cc',
-        'omaha_query_params/omaha_query_params_delegate.h',
+        'omaha_client/omaha_query_params.cc',
+        'omaha_client/omaha_query_params.h',
+        'omaha_client/omaha_query_params_delegate.cc',
+        'omaha_client/omaha_query_params_delegate.h',
       ],
     },
   ],
diff --git a/components/omaha_query_params/BUILD.gn b/components/omaha_client/BUILD.gn
index 7d2089a..3cb5e01 100644
--- a/components/omaha_query_params/BUILD.gn
+++ b/components/omaha_client/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("omaha_query_params") {
+source_set("omaha_client") {
   sources = [
     "omaha_query_params.cc",
     "omaha_query_params.h",
diff --git a/components/omaha_query_params/DEPS b/components/omaha_client/DEPS
index beabace..beabace 100644
--- a/components/omaha_query_params/DEPS
+++ b/components/omaha_client/DEPS
diff --git a/components/omaha_query_params/OWNERS b/components/omaha_client/OWNERS
index c089b54..c089b54 100644
--- a/components/omaha_query_params/OWNERS
+++ b/components/omaha_client/OWNERS
diff --git a/components/omaha_query_params/omaha_query_params.cc b/components/omaha_client/omaha_query_params.cc
index b04116db..9abaa9d 100644
--- a/components/omaha_query_params/omaha_query_params.cc
+++ b/components/omaha_client/omaha_query_params.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_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_query_params/omaha_query_params_delegate.h"
+#include "components/omaha_client/omaha_query_params_delegate.h"
 
-namespace omaha_query_params {
+namespace omaha_client {
 
 namespace {
 
@@ -131,4 +131,4 @@ void OmahaQueryParams::SetDelegate(OmahaQueryParamsDelegate* delegate) {
   g_delegate = delegate;
 }
 
-}  // namespace omaha_query_params
+}  // namespace omaha_client
diff --git a/components/omaha_query_params/omaha_query_params.h b/components/omaha_client/omaha_query_params.h
index 85ddeac..7a4d792 100644
--- a/components/omaha_query_params/omaha_query_params.h
+++ b/components/omaha_client/omaha_query_params.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_H_
-#define COMPONENTS_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_H_
+#ifndef COMPONENTS_OMAHA_CLIENT_OMAHA_QUERY_PARAMS_H_
+#define COMPONENTS_OMAHA_CLIENT_OMAHA_QUERY_PARAMS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 
-namespace omaha_query_params {
+namespace omaha_client {
 
 class OmahaQueryParamsDelegate;
 
@@ -55,6 +55,6 @@ class OmahaQueryParams {
   DISALLOW_IMPLICIT_CONSTRUCTORS(OmahaQueryParams);
 };
 
-}  // namespace omaha_query_params
+}  // namespace omaha_client
 
-#endif  // COMPONENTS_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_H_
+#endif  // COMPONENTS_OMAHA_CLIENT_OMAHA_QUERY_PARAMS_H_
diff --git a/components/omaha_query_params/omaha_query_params_delegate.cc b/components/omaha_client/omaha_query_params_delegate.cc
index 9d79a94..1da1854 100644
--- a/components/omaha_query_params/omaha_query_params_delegate.cc
+++ b/components/omaha_client/omaha_query_params_delegate.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/omaha_query_params/omaha_query_params_delegate.h"
+#include "components/omaha_client/omaha_query_params_delegate.h"
 
-namespace omaha_query_params {
+namespace omaha_client {
 
 OmahaQueryParamsDelegate::OmahaQueryParamsDelegate() {
 }
@@ -12,4 +12,4 @@ OmahaQueryParamsDelegate::OmahaQueryParamsDelegate() {
 OmahaQueryParamsDelegate::~OmahaQueryParamsDelegate() {
 }
 
-}  // namespace omaha_query_params
+}  // namespace omaha_client
diff --git a/components/omaha_query_params/omaha_query_params_delegate.h b/components/omaha_client/omaha_query_params_delegate.h
index ebea760..ab52436 100644
--- a/components/omaha_query_params/omaha_query_params_delegate.h
+++ b/components/omaha_client/omaha_query_params_delegate.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_DELEGATE_H_
-#define COMPONENTS_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_DELEGATE_H_
+#ifndef COMPONENTS_OMAHA_CLIENT_OMAHA_QUERY_PARAMS_DELEGATE_H_
+#define COMPONENTS_OMAHA_CLIENT_OMAHA_QUERY_PARAMS_DELEGATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 
-namespace omaha_query_params {
+namespace omaha_client {
 
 // Embedders can specify an OmahaQueryParamsDelegate to provide additional
 // custom parameters. If not specified (Set is never called), no additional
@@ -27,6 +27,6 @@ class OmahaQueryParamsDelegate {
   DISALLOW_COPY_AND_ASSIGN(OmahaQueryParamsDelegate);
 };
 
-}  // namespace omaha_query_params
+}  // namespace omaha_client
 
-#endif  // COMPONENTS_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_DELEGATE_H_
+#endif  // COMPONENTS_OMAHA_CLIENT_OMAHA_QUERY_PARAMS_DELEGATE_H_
diff --git a/components/omaha_query_params/omaha_query_params_unittest.cc b/components/omaha_client/omaha_query_params_unittest.cc
index cfaf667..f18e46d 100644
--- a/components/omaha_query_params/omaha_query_params_unittest.cc
+++ b/components/omaha_client/omaha_query_params_unittest.cc
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 #include "base/strings/stringprintf.h"
-#include "components/omaha_query_params/omaha_query_params.h"
-#include "components/omaha_query_params/omaha_query_params_delegate.h"
+#include "components/omaha_client/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPrintf;
 
-namespace omaha_query_params {
+namespace omaha_client {
 
 namespace {
 
@@ -52,4 +52,4 @@ TEST(OmahaQueryParamsTest, GetParams) {
   TestParams(OmahaQueryParams::CHROME, true);
 }
 
-}  // namespace omaha_query_params
+}  // namespace omaha_client
diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS
index 117bedd..d2863e2 100644
--- a/extensions/browser/DEPS
+++ b/extensions/browser/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+components/keyed_service",
-  "+components/omaha_query_params",
+  "+components/omaha_client",
   "+components/pref_registry",
   "+components/sessions",
   "+components/storage_monitor",
diff --git a/extensions/browser/updater/update_service.cc b/extensions/browser/updater/update_service.cc
index 286d137..d1b0cae 100644
--- a/extensions/browser/updater/update_service.cc
+++ b/extensions/browser/updater/update_service.cc
@@ -5,13 +5,13 @@
 #include "extensions/browser/updater/update_service.h"
 
 #include "base/message_loop/message_loop.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/updater/extension_downloader.h"
 #include "extensions/browser/updater/update_service_factory.h"
 #include "extensions/common/extension_urls.h"
 
-using omaha_query_params::OmahaQueryParams;
+using omaha_client::OmahaQueryParams;
 
 namespace extensions {
 
diff --git a/extensions/browser/updater/update_service_browsertest.cc b/extensions/browser/updater/update_service_browsertest.cc
index 0ec702a..78fe377 100644
--- a/extensions/browser/updater/update_service_browsertest.cc
+++ b/extensions/browser/updater/update_service_browsertest.cc
@@ -27,8 +27,7 @@ namespace {
 using FakeResponse = std::pair<std::string, net::HttpStatusCode>;
 
 // TODO(rockot): In general there's enough mock-Omaha-noise that this might be
-// better placed into some test library code in //components/omaha_client (which
-// would be renamed from omaha_query_params).
+// better placed into some test library code in //components/omaha_client.
 FakeResponse CreateFakeOmahaResponse(const std::string& id, size_t crx_length) {
   std::string response_text = base::StringPrintf(
       "<gupdate xmlns=\"http://www.google.com/update2/response\" "
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index a97dfd2..19a69766 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -28,7 +28,7 @@ source_set("app_shell_lib") {
     ":version_header",
     "//base",
     "//base:prefs_test_support",
-    "//components/omaha_query_params",
+    "//components/omaha_client",
     "//components/pref_registry",
     "//components/user_prefs",
     "//components/web_cache/renderer",
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 09f99a9..2a85713 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -14,7 +14,7 @@
         'app_shell_version_header',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_prefs_test_support',
-        '<(DEPTH)/components/components.gyp:omaha_query_params',
+        '<(DEPTH)/components/components.gyp:omaha_client',
         '<(DEPTH)/components/components.gyp:pref_registry',
         '<(DEPTH)/components/components.gyp:user_prefs',
         '<(DEPTH)/components/components.gyp:web_cache_renderer',
diff --git a/extensions/shell/browser/DEPS b/extensions/shell/browser/DEPS
index 34a72e3..032cdb0 100644
--- a/extensions/shell/browser/DEPS
+++ b/extensions/shell/browser/DEPS
@@ -3,7 +3,7 @@ include_rules = [
   "+components/keyed_service",
   "+components/nacl/browser",
   "+components/nacl/common",
-  "+components/omaha_query_params",
+  "+components/omaha_client",
   "+components/pref_registry",
   "+components/user_prefs",
   "+components/web_modal",
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index f376cbc..03ce600 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_client/omaha_query_params.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/context_factory.h"
@@ -147,7 +147,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
   ExtensionsBrowserClient::Set(extensions_browser_client_.get());
 
   omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);
-  omaha_query_params::OmahaQueryParams::SetDelegate(
+  omaha_client::OmahaQueryParams::SetDelegate(
       omaha_query_params_delegate_.get());
 
   // Create our custom ExtensionSystem first because other
diff --git a/extensions/shell/browser/shell_omaha_query_params_delegate.h b/extensions/shell/browser/shell_omaha_query_params_delegate.h
index 05c84d9..ad17a4c 100644
--- a/extensions/shell/browser/shell_omaha_query_params_delegate.h
+++ b/extensions/shell/browser/shell_omaha_query_params_delegate.h
@@ -5,12 +5,12 @@
 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_OMAHA_QUERY_PARAMS_DELEGATE_H_
 #define EXTENSIONS_SHELL_BROWSER_SHELL_OMAHA_QUERY_PARAMS_DELEGATE_H_
 
-#include "components/omaha_query_params/omaha_query_params_delegate.h"
+#include "components/omaha_client/omaha_query_params_delegate.h"
 
 namespace extensions {
 
 class ShellOmahaQueryParamsDelegate
-    : public omaha_query_params::OmahaQueryParamsDelegate {
+    : public omaha_client::OmahaQueryParamsDelegate {
  public:
   ShellOmahaQueryParamsDelegate();
   ~ShellOmahaQueryParamsDelegate() override;