Move OmahaQueryParams to a component and add a delegate interface.

chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.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 "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_warning_service.h"
 #include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
-#include "chrome/browser/omaha_query_params/omaha_query_params.h"
 #include "chrome/browser/profiles/profile.h"
 #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 "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/api/runtime.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #endif
 
@@ skipping 146 matching lines @@
 
   chrome::NavigateParams params(
       browser, uninstall_url, content::PAGE_TRANSITION_CLIENT_REDIRECT);
   params.disposition = NEW_FOREGROUND_TAB;
   params.user_gesture = false;
   chrome::Navigate(&params);
 #endif
 }
 
 bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
-  const char* os = chrome::OmahaQueryParams::GetOS();
+  const char* os = OmahaQueryParams::GetOS();
   if (strcmp(os, "mac") == 0) {
     info->os = PlatformInfo::OS_MAC_;
   } else if (strcmp(os, "win") == 0) {
     info->os = PlatformInfo::OS_WIN_;
   } else if (strcmp(os, "android") == 0) {
     info->os = PlatformInfo::OS_ANDROID_;
   } else if (strcmp(os, "cros") == 0) {
     info->os = PlatformInfo::OS_CROS_;
   } else if (strcmp(os, "linux") == 0) {
     info->os = PlatformInfo::OS_LINUX_;
   } else if (strcmp(os, "openbsd") == 0) {
     info->os = PlatformInfo::OS_OPENBSD_;
   } else {
     NOTREACHED();
     return false;
   }
 
-  const char* arch = chrome::OmahaQueryParams::GetArch();
+  const char* arch = OmahaQueryParams::GetArch();
   if (strcmp(arch, "arm") == 0) {
     info->arch = PlatformInfo::ARCH_ARM;
   } else if (strcmp(arch, "x86") == 0) {
     info->arch = PlatformInfo::ARCH_X86_32;
   } else if (strcmp(arch, "x64") == 0) {
     info->arch = PlatformInfo::ARCH_X86_64;
   } else {
     NOTREACHED();
     return false;
   }
 
-  const char* nacl_arch = chrome::OmahaQueryParams::GetNaclArch();
+  const char* nacl_arch = OmahaQueryParams::GetNaclArch();
   if (strcmp(nacl_arch, "arm") == 0) {
     info->nacl_arch = PlatformInfo::NACL_ARCH_ARM;
   } else if (strcmp(nacl_arch, "x86-32") == 0) {
     info->nacl_arch = PlatformInfo::NACL_ARCH_X86_32;
   } else if (strcmp(nacl_arch, "x86-64") == 0) {
     info->nacl_arch = PlatformInfo::NACL_ARCH_X86_64;
   } else {
     NOTREACHED();
     return false;
   }
@@ skipping 48 matching lines @@
     const UpdateCheckResult& result) {
   UpdateCallbackList callbacks = pending_update_checks_[extension_id];
   pending_update_checks_.erase(extension_id);
   for (UpdateCallbackList::const_iterator iter = callbacks.begin();
        iter != callbacks.end();
        ++iter) {
     const UpdateCheckCallback& callback = *iter;
     callback.Run(result);
   }
 }