Remove Instant hooks from SearchProvider.

chrome/browser/ui/search/instant_controller.cc

 // Copyright 2012 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_controller.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 530 matching lines @@
   // suggestion or reset the existing "gray text".
   browser_->SetInstantSuggestion(last_suggestion_);
 
   // Record the time of the first keypress for logging histograms.
   if (!first_interaction_time_recorded_ && first_interaction_time_.is_null())
     first_interaction_time_ = base::Time::Now();
 
   return true;
 }
 
-bool InstantController::WillFetchCompletions() const {
-  if (!extended_enabled())
-    return false;
-
-  return !UsingLocalPage();
-}
-
 scoped_ptr<content::WebContents> InstantController::ReleaseNTPContents() {
   if (!extended_enabled() || !browser_->profile() ||
       browser_->profile()->IsOffTheRecord() ||
       !chrome::ShouldShowInstantNTP())
     return scoped_ptr<content::WebContents>();
 
   LOG_INSTANT_DEBUG_EVENT(this, "ReleaseNTPContents");
 
   if (ShouldSwitchToLocalNTP())
     ResetNTP(GetLocalInstantURL());
@@ skipping 49 matching lines @@
     return;
 
   if (!UseTabForSuggestions() && !overlay_)
     return;
 
   // The omnibox sends suggestions when its possibly imaginary popup closes
   // as it stops autocomplete. Ignore these.
   if (omnibox_focus_state_ == OMNIBOX_FOCUS_NONE)
     return;
 
-  for (ACProviders::const_iterator provider = providers.begin();
-       provider != providers.end(); ++provider) {
-    const bool from_search_provider =
-        (*provider)->type() == AutocompleteProvider::TYPE_SEARCH;
-
-    // TODO(jeremycho): Pass search_provider() as a parameter to this function
-    // and remove the static cast.
-    const bool provider_done = from_search_provider ?
-        static_cast<SearchProvider*>(*provider)->IsNonInstantSearchDone() :
-        (*provider)->done();
-    if (!provider_done) {
-      DVLOG(1) << "Waiting for " << (*provider)->GetName();
-      return;
-    }
-  }
-
   DVLOG(1) << "AutocompleteResults:";
   std::vector<InstantAutocompleteResult> results;
   if (UsingLocalPage()) {
     for (AutocompleteResult::const_iterator match(autocomplete_result.begin());
          match != autocomplete_result.end(); ++match) {
       InstantAutocompleteResult result;
       PopulateInstantAutocompleteResultFromMatch(
           *match, std::distance(autocomplete_result.begin(), match), &result);
       results.push_back(result);
     }
@@ skipping 1269 matching lines @@
 
 bool InstantController::InStartup() const {
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   return !browser_->GetActiveWebContents();
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }