Partially componentize //chrome/browser/search/search.{h,cc}

chrome/browser/ui/search/search_ipc_router.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/search/search_ipc_router.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/render_messages.h"
+#include "components/search/search.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 bool IsProviderValid(const base::string16& provider) {
   // Only allow string of 8 alphanumeric characters or less as providers.
   // The empty string is considered valid and should be treated as if no
   // provider were specified.
   if (provider.length() > 8)
@@ skipping 53 matching lines @@
     return;
 
   Send(new ChromeViewMsg_SearchBoxPromoInformation(routing_id(),
                                                    is_app_launcher_enabled));
 }
 
 void SearchIPCRouter::SetDisplayInstantResults() {
   if (!policy_->ShouldSendSetDisplayInstantResults())
     return;
 
-  bool is_search_results_page = !chrome::GetSearchTerms(web_contents()).empty();
-  bool display_instant_results = is_search_results_page ?
-      chrome::ShouldPrefetchSearchResultsOnSRP() :
-          chrome::ShouldPrefetchSearchResults();
+  bool is_search_results_page = !search::GetSearchTerms(web_contents()).empty();
+  bool display_instant_results =
+      is_search_results_page ? search::ShouldPrefetchSearchResultsOnSRP()
+                             : search::ShouldPrefetchSearchResults();
   Send(new ChromeViewMsg_SearchBoxSetDisplayInstantResults(
        routing_id(), display_instant_results));
 }
 
 void SearchIPCRouter::SetSuggestionToPrefetch(
     const InstantSuggestion& suggestion) {
   if (!policy_->ShouldSendSetSuggestionToPrefetch())
     return;
 
   Send(new ChromeViewMsg_SearchBoxSetSuggestionToPrefetch(routing_id(),
@@ skipping 61 matching lines @@
 void SearchIPCRouter::OnTabDeactivated() {
   is_active_tab_ = false;
 }
 
 bool SearchIPCRouter::OnMessageReceived(const IPC::Message& message) {
   if (IPC_MESSAGE_CLASS(message) != ChromeMsgStart)
     return false;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  if (!chrome::IsRenderedInInstantProcess(web_contents(), profile))
+  if (!search::IsRenderedInInstantProcess(web_contents(), profile))
     return false;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchIPCRouter, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
                         OnInstantSupportDetermined)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetVoiceSearchSupported,
                         OnVoiceSearchSupportDetermined)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FocusOmnibox, OnFocusOmnibox);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxNavigate,
@@ skipping 180 matching lines @@
 
 void SearchIPCRouter::set_delegate_for_testing(Delegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 }
 
 void SearchIPCRouter::set_policy_for_testing(scoped_ptr<Policy> policy) {
   DCHECK(policy.get());
   policy_.reset(policy.release());
 }