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

chrome/browser/android/omnibox/autocomplete_controller_android.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/android/omnibox/autocomplete_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 319 matching lines @@
 
 void AutocompleteControllerAndroid::OnResultChanged(
     bool default_match_changed) {
   if (!autocomplete_controller_)
     return;
 
   const AutocompleteResult& result = autocomplete_controller_->result();
   const AutocompleteResult::const_iterator default_match(
       result.default_match());
   if ((default_match != result.end()) && default_match_changed &&
-      chrome::IsInstantExtendedAPIEnabled() &&
-      chrome::ShouldPrefetchSearchResults()) {
+      search::IsInstantExtendedAPIEnabled() &&
+      search::ShouldPrefetchSearchResults()) {
     InstantSuggestion prefetch_suggestion;
     // If the default match should be prefetched, do that.
     if (SearchProvider::ShouldPrefetch(*default_match)) {
       prefetch_suggestion.text = default_match->contents;
       prefetch_suggestion.metadata =
           SearchProvider::GetSuggestMetadata(*default_match);
     }
     // Send the prefetch suggestion unconditionally to the Instant search base
     // page. If there is no suggestion to prefetch, we need to send a blank
     // query to clear the prefetched results.
@@ skipping 202 matching lines @@
     return;
 
   // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
   new ZeroSuggestPrefetcher(profile);
 }
 
 // Register native methods
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }