Move OmahaQueryParams to a component and add a delegate interface.

chrome/browser/ui/webui/app_list/start_page_handler.cc

 // Copyright 2013 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/ui/webui/app_list/start_page_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "chrome/browser/omaha_query_params/omaha_query_params.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/recommended_apps.h"
 #include "chrome/browser/ui/app_list/start_page_service.h"
 #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 "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/speech_ui_model_observer.h"
 #include "ui/events/event_constants.h"
 
@@ skipping 141 matching lines @@
         base::Bind(&StartPageHandler::OnHotwordEnabledChanged,
                    base::Unretained(this)));
 
     extension_registry_observer_.Add(
         extensions::ExtensionRegistry::Get(profile));
   }
 #endif
 
   web_ui()->CallJavascriptFunction(
       "appList.startPage.setNaclArch",
-      base::StringValue(chrome::OmahaQueryParams::GetNaclArch()));
+      base::StringValue(omaha_query_params::OmahaQueryParams::GetNaclArch()));
 
   if (!app_list::switches::IsExperimentalAppListEnabled()) {
     web_ui()->CallJavascriptFunction(
         "appList.startPage.onAppListShown",
         base::FundamentalValue(service->HotwordEnabled()));
   }
 }
 
 void StartPageHandler::HandleLaunchApp(const base::ListValue* args) {
   std::string app_id;
@@ skipping 56 matching lines @@
   else if (state_string == "NETWORK_ERROR")
     new_state = SPEECH_RECOGNITION_NETWORK_ERROR;
 
   StartPageService* service =
       StartPageService::Get(Profile::FromWebUI(web_ui()));
   if (service)
     service->OnSpeechRecognitionStateChanged(new_state);
 }
 
 }  // namespace app_list