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

chrome/browser/ui/omnibox/chrome_omnibox_client.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/omnibox/chrome_omnibox_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 39 matching lines @@
 // highly or if kAllowPrefetchNonDefaultMatch field trial is enabled, we'll
 // return it.
 //
 // If the kAllowPrefetchNonDefaultMatch field trial is enabled we return the
 // prefetch suggestion even if it is not the default match. Otherwise we only
 // care about matches that are the default or the second entry in the dropdown
 // (which can happen for non-default matches when a top verbatim match is
 // shown); for other matches, we think the likelihood of the user selecting
 // them is low enough that prefetching isn't worth doing.
 const AutocompleteMatch* GetMatchToPrefetch(const AutocompleteResult& result) {
-  if (chrome::ShouldAllowPrefetchNonDefaultMatch()) {
+  if (search::ShouldAllowPrefetchNonDefaultMatch()) {
     const AutocompleteResult::const_iterator prefetch_match = std::find_if(
         result.begin(), result.end(), SearchProvider::ShouldPrefetch);
     return prefetch_match != result.end() ? &(*prefetch_match) : NULL;
   }
 
   // If the default match should be prefetched, do that.
   const auto default_match = result.default_match();
   if ((default_match != result.end()) &&
       SearchProvider::ShouldPrefetch(*default_match))
     return &(*default_match);
@@ skipping 56 matching lines @@
 
 bool ChromeOmniboxClient::CurrentPageExists() const {
   return (controller_->GetWebContents() != NULL);
 }
 
 const GURL& ChromeOmniboxClient::GetURL() const {
   return controller_->GetWebContents()->GetURL();
 }
 
 bool ChromeOmniboxClient::IsInstantNTP() const {
-  return chrome::IsInstantNTP(controller_->GetWebContents());
+  return search::IsInstantNTP(controller_->GetWebContents());
 }
 
 bool ChromeOmniboxClient::IsSearchResultsPage() const {
   Profile* profile = Profile::FromBrowserContext(
       controller_->GetWebContents()->GetBrowserContext());
   return TemplateURLServiceFactory::GetForProfile(profile)->
       IsSearchResultsPageFromDefaultSearchProvider(GetURL());
 }
 
 bool ChromeOmniboxClient::IsLoading() const {
@@ skipping 49 matching lines @@
   if (!controller_->GetWebContents())
     return;
   SearchTabHelper::FromWebContents(
       controller_->GetWebContents())->OmniboxFocusChanged(state, reason);
 }
 
 void ChromeOmniboxClient::OnResultChanged(
     const AutocompleteResult& result,
     bool default_match_changed,
     const base::Callback<void(const SkBitmap& bitmap)>& on_bitmap_fetched) {
-  if (chrome::IsInstantExtendedAPIEnabled() &&
+  if (search::IsInstantExtendedAPIEnabled() &&
       ((default_match_changed && result.default_match() != result.end()) ||
-       (chrome::ShouldAllowPrefetchNonDefaultMatch() && !result.empty()))) {
+       (search::ShouldAllowPrefetchNonDefaultMatch() && !result.empty()))) {
     InstantSuggestion prefetch_suggestion;
     const AutocompleteMatch* match_to_prefetch = GetMatchToPrefetch(result);
     if (match_to_prefetch) {
       prefetch_suggestion.text = match_to_prefetch->contents;
       prefetch_suggestion.metadata =
           SearchProvider::GetSuggestMetadata(*match_to_prefetch);
     }
     // Send the prefetch suggestion unconditionally to the InstantPage. If
     // there is no suggestion to prefetch, we need to send a blank query to
     // clear the prefetched results.
@@ skipping 63 matching lines @@
         match.destination_url,
         predictors::AutocompleteActionPredictor::IsPreconnectable(match));
   }
   // We could prefetch the alternate nav URL, if any, but because there
   // can be many of these as a user types an initial series of characters,
   // the OS DNS cache could suffer eviction problems for minimal gain.
 }
 
 void ChromeOmniboxClient::SetSuggestionToPrefetch(
       const InstantSuggestion& suggestion) {
-  DCHECK(chrome::IsInstantExtendedAPIEnabled());
+  DCHECK(search::IsInstantExtendedAPIEnabled());
   content::WebContents* web_contents = controller_->GetWebContents();
   if (web_contents &&
       SearchTabHelper::FromWebContents(web_contents)->IsSearchResultsPage()) {
-    if (chrome::ShouldPrefetchSearchResultsOnSRP()) {
+    if (search::ShouldPrefetchSearchResultsOnSRP()) {
       SearchTabHelper::FromWebContents(web_contents)->
           SetSuggestionToPrefetch(suggestion);
     }
   } else {
     InstantSearchPrerenderer* prerenderer =
         InstantSearchPrerenderer::GetForProfile(profile_);
     if (prerenderer)
       prerenderer->Prerender(suggestion);
   }
 }
 
 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
                                           const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   callback.Run(bitmap);
 }