Allow the history URL provider to handle input of type QUERY. This helps in ...

chrome/browser/autocomplete/search_provider.h

 // Copyright (c) 2009 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all non-keyword autocomplete entries that start with
 // "Search <engine> for ...", including searching for the current input string,
 // search history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 //
@@ skipping 218 matching lines @@
                               int did_not_accept_suggestion,
                               MatchMap* map);
 
   // Determines the relevance for a particular match.  We use different scoring
   // algorithms for the different types of matches.
   int CalculateRelevanceForWhatYouTyped() const;
   // |time| is the time at which this query was last seen. |is_keyword| is true
   // if the search is from the keyword provider.
   int CalculateRelevanceForHistory(const base::Time& time,
                                    bool is_keyword) const;
-  // |suggestion_value| is the index of the suggestion in |suggest_results| that
-  // was returned from the server; the best suggestion is suggestion number 0.
-  // |is_keyword| is true if the search is from the keyword provider.
-  int CalculateRelevanceForSuggestion(const SuggestResults& suggest_results,
-                                      size_t suggestion_number,
+  // |result_number| is the index of the suggestion in the result set from the
+  // server; the best suggestion is suggestion number 0.  |is_keyword| is true
+  // if the search is from the keyword provider.
+  int CalculateRelevanceForSuggestion(size_t num_results,
+                                      size_t result_number,
                                       bool is_keyword) const;
-  // |suggestion_value| is same as above. |is_keyword| is true if the navigation
+  // |result_number| is same as above. |is_keyword| is true if the navigation
   // result was suggested by the keyword provider.
-  int CalculateRelevanceForNavigation(size_t suggestion_value,
+  int CalculateRelevanceForNavigation(size_t num_results,
+                                      size_t result_number,
                                       bool is_keyword) const;
 
   // Creates an AutocompleteMatch for "Search <engine> for |query_string|" with
   // the supplied relevance.  Adds this match to |map|; if such a match already
   // exists, whichever one has lower relevance is eliminated.
   void AddMatchToMap(const std::wstring& query_string,
                      int relevance,
                      AutocompleteMatch::Type type,
                      int accepted_suggestion,
                      bool is_keyword,
@@ skipping 57 matching lines @@
   NavigationResults keyword_navigation_results_;
   NavigationResults default_navigation_results_;
 
   // Whether suggest_results_ is valid.
   bool have_suggest_results_;
 
   DISALLOW_EVIL_CONSTRUCTORS(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_