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 603 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;
-

[sreeram, 2013/05/24 21:00:59]

This will end up sending NAVSUGGEST as well, re-introducing the bug where it
gets duped against a history suggestion (and outscores it). So, below, in the
inner loop, skip NAVSUGGEST.

[Jered, 2013/05/28 17:25:30]

Done.

       for (ACMatches::const_iterator match = (*provider)->matches().begin();
            match != (*provider)->matches().end(); ++match) {
         InstantAutocompleteResult result;
         PopulateInstantAutocompleteResultFromMatch(*match, kNoMatchIndex,
                                                    &result);
         results.push_back(result);
       }
     }
   }
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
@@ skipping 1195 matching lines @@
 
   result->transition = match.transition;
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
   DVLOG(1) << "    " << result->relevance << " " << result->type << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }