Remove Instant hooks from SearchProvider.

chrome/browser/ui/omnibox/omnibox_controller.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/omnibox_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/search_provider.h"
@@ skipping 51 matching lines @@
     const GURL& current_url,
     bool prevent_inline_autocomplete,
     bool prefer_keyword,
     bool allow_exact_keyword_match,
     int omnibox_start_margin) const {
   ClearPopupKeywordMode();
   popup_->SetHoveredLine(OmniboxPopupModel::kNoMatch);
 
 #if defined(HTML_INSTANT_EXTENDED_POPUP)
   InstantController* instant_controller = GetInstantController();
   if (instant_controller) {

[kmadhusu, 2013/06/25 23:30:33]

nit: Remove {}.

[Jered, 2013/06/25 23:33:40]

Done.

     instant_controller->OnAutocompleteStart();
-    // If the embedded page for InstantExtended is fetching its own suggestions,
-    // suppress search suggestions from SearchProvider. We still need
-    // SearchProvider to run for FinalizeInstantQuery.
-    // TODO(dcblack): Once we are done refactoring the omnibox so we don't need
-    // to use FinalizeInstantQuery anymore, we can take out this check and
-    // remove this provider from kInstantExtendedOmniboxProviders.
-    if (instant_controller->WillFetchCompletions())
-      autocomplete_controller_->search_provider()->SuppressSearchSuggestions();
   }
 #endif
   if (chrome::IsInstantExtendedAPIEnabled()) {
     autocomplete_controller_->search_provider()->
         SetOmniboxStartMargin(omnibox_start_margin);
   }
 
   // We don't explicitly clear OmniboxPopupModel::manually_selected_match, as
   // Start ends up invoking OmniboxPopupModel::OnResultChanged which clears it.
   autocomplete_controller_->Start(AutocompleteInput(
@@ skipping 85 matching lines @@
       autocomplete_controller_->input().type(), &full_text);
   return instant_controller->Update(
       match, user_text, full_text, selection_start, selection_end,
       UseVerbatimInstant(just_deleted_text), user_input_in_progress,
       popup_->IsOpen(), in_escape_handler, keyword_is_selected);
 #else
   return false;
 #endif
 }
 
-void OmniboxController::FinalizeInstantQuery(
-    const string16& input_text,
-    const InstantSuggestion& suggestion) {
-// Should only get called for the HTML popup.
-#if defined(HTML_INSTANT_EXTENDED_POPUP)
-  if (!popup_model()->result().empty()) {
-    // We need to finalize the instant query in all cases where the
-    // |popup_model| holds some result. It is not enough to check whether the
-    // popup is open, since when an IME is active the popup may be closed while
-    // |popup_model| contains a non-empty result.
-    SearchProvider* search_provider =
-        autocomplete_controller_->search_provider();
-    // There may be no providers during testing; guard against that.
-    if (search_provider)
-      search_provider->FinalizeInstantQuery(input_text, suggestion);
-  }
-#endif
-}
-
 void OmniboxController::SetInstantSuggestion(
     const InstantSuggestion& suggestion) {
 // Should only get called for the HTML popup.
 #if defined(HTML_INSTANT_EXTENDED_POPUP)
   switch (suggestion.behavior) {
     case INSTANT_COMPLETE_NOW:
       // Set blue suggestion text.
-      // TODO(beaudoin): This currently goes to the SearchProvider. Instead we
-      // should just create a valid current_match_ and call
-      // omnibox_edit_model_->OnCurrentMatchChanged. This way we can get rid of
-      // FinalizeInstantQuery entirely.
-      if (!suggestion.text.empty())
-        FinalizeInstantQuery(omnibox_edit_model_->GetViewText(), suggestion);
+      // TODO(beaudoin): Create a valid current_match_ and call
+      // omnibox_edit_model_->OnCurrentMatchChanged.
       return;
 
     case INSTANT_COMPLETE_NEVER: {
       DCHECK_EQ(INSTANT_SUGGESTION_SEARCH, suggestion.type);
 
       // Set gray suggestion text.
       // Remove "?" if we're in forced query mode.
       gray_suggestion_ = suggestion.text;
 
-      // TODO(beaudoin): The following should no longer be needed once the
-      // instant suggestion no longer goes through the search provider.
-      SearchProvider* search_provider =
-          autocomplete_controller_->search_provider();
-      if (search_provider)
-        search_provider->ClearInstantSuggestion();
-
       omnibox_edit_model_->OnGrayTextChanged();
       return;
     }
 
     case INSTANT_COMPLETE_REPLACE:
       // Replace the entire omnibox text by the suggestion the user just arrowed
       // to.
       CreateAndSetInstantMatch(suggestion.text, suggestion.text,
                                suggestion.type == INSTANT_SUGGESTION_SEARCH ?
                                    AutocompleteMatchType::SEARCH_SUGGEST :
@@ skipping 66 matching lines @@
     string16 input_text,
     AutocompleteMatchType::Type match_type) {
   string16 keyword = GetDefaultSearchProviderKeyword(profile_);
   if (keyword.empty())
     return;  // CreateSearchSuggestion needs a keyword.
 
   current_match_ = SearchProvider::CreateSearchSuggestion(
       profile_, NULL, AutocompleteInput(), query_string, input_text, 0,
       match_type, 0, false, keyword, -1);
 }