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

chrome/browser/ui/search/instant_search_prerenderer.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/instant_search_prerenderer.h"
 
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "components/omnibox/browser/autocomplete_match.h"
+#include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 
 namespace {
 
 // Returns true if the underlying page supports Instant search.
 bool PageSupportsInstantSearch(content::WebContents* contents) {
   // Search results page supports Instant search.
   return SearchTabHelper::FromWebContents(contents)->IsSearchResultsPage();
 }
 
@@ skipping 97 matching lines @@
 
   // InstantSearchPrerenderer can commit query to the prerendered page only if
   // the underlying |source| page doesn't support Instant search.
   return !PageSupportsInstantSearch(source);
 }
 
 bool InstantSearchPrerenderer::UsePrerenderedPage(
     const GURL& url,
     chrome::NavigateParams* params) {
   base::string16 search_terms =
-      chrome::ExtractSearchTermsFromURL(profile_, url);
+      search::ExtractSearchTermsFromURL(profile_, url);
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(profile_);
   if (search_terms.empty() || !params->target_contents ||
       !prerender_contents() || !prerender_manager ||
       !QueryMatchesPrefetch(search_terms) ||
       params->disposition != CURRENT_TAB) {
     Cancel();
     return false;
   }
 
@@ skipping 38 matching lines @@
       !PageSupportsInstantSearch(source);
 }
 
 content::WebContents* InstantSearchPrerenderer::prerender_contents() const {
   return (prerender_handle_ && prerender_handle_->contents()) ?
       prerender_handle_->contents()->prerender_contents() : NULL;
 }
 
 bool InstantSearchPrerenderer::QueryMatchesPrefetch(
     const base::string16& query) const {
-  if (chrome::ShouldReuseInstantSearchBasePage())
+  if (search::ShouldReuseInstantSearchBasePage())
     return true;
   return last_instant_suggestion_.text == query;
 }