InstantExtended: Send SearchProvider suggestions to the page.

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/string_util.h"
@@ skipping 634 matching lines @@
     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);
     }
   } else {
     for (ACProviders::const_iterator provider = providers.begin();
          provider != providers.end(); ++provider) {
-      // We are talking to remote NTP, skip SearchProvider, since it only echoes
-      // suggestions.
-      if ((*provider)->type() == AutocompleteProvider::TYPE_SEARCH)
-        continue;
-
       for (ACMatches::const_iterator match = (*provider)->matches().begin();
            match != (*provider)->matches().end(); ++match) {
+        // When the top match is an inline history URL, the page calls
+        // SetSuggestions(url) which calls FinalizeInstantQuery() in
+        // SearchProvider creating a NAVSUGGEST match for the URL. If we sent
+        // this NAVSUGGEST match back to the page, it would be deduped against
+        // the original history match and replace it. But since the page ignores
+        // SearchProvider suggestions, the match would then disappear. Yuck.
+        // TODO(jered): Remove this when FinalizeInstantQuery() is ripped out.
+        if ((*provider)->type() == AutocompleteProvider::TYPE_SEARCH &&
+            match->type == AutocompleteMatchType::NAVSUGGEST) {
+          continue;
+        }
         InstantAutocompleteResult result;
         PopulateInstantAutocompleteResultFromMatch(*match, kNoMatchIndex,
                                                    &result);
         results.push_back(result);
       }
     }
   }
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "HandleAutocompleteResults: total_results=%d",
       static_cast<int>(results.size())));
@@ skipping 1203 matching lines @@
   result->transition = match.transition;
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
   DVLOG(1) << "    " << result->relevance << " "
       << UTF8ToUTF16(AutocompleteMatchType::ToString(result->type)) << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }