HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/autocomplete/history_quick_provider.h

Index: chrome/browser/autocomplete/history_quick_provider.h
===================================================================
--- chrome/browser/autocomplete/history_quick_provider.h	(revision 103712)
+++ chrome/browser/autocomplete/history_quick_provider.h	(working copy)
@@ -37,9 +37,6 @@
 
   virtual void DeleteMatch(const AutocompleteMatch& match) OVERRIDE;
 
-  // Performs the autocomplete matching and scoring.
-  void DoAutocomplete();
-
   // Disable this provider. For unit testing purposes only. This is required
   // because this provider is closely associated with the HistoryURLProvider
   // and in order to properly test the latter the HistoryQuickProvider must
@@ -52,6 +49,12 @@
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Spans);
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Relevance);
 
+  // The initial maximum allowable score for a match which cannot be inlined.
+  static const int kMaxNonInliningScore;

[Peter Kasting, 2011/10/05 00:11:42]

I suspect this is leftover from merges, since we removed this constant in the
static initializer purge (
http://src.chromium.org/viewvc/chrome?view=rev&revision=99036 ).

[mrossetti, 2011/10/07 17:04:14]

Done.

+
+  // Performs the autocomplete matching and scoring.
+  void DoAutocomplete();
+
   // Creates an AutocompleteMatch from |history_match|. |max_match_score| gives
   // the maximum possible score for the match. |history_matches| is the full set
   // of matches to compare each match to when calculating confidence.
@@ -81,7 +84,8 @@
       bool is_url);
 
   // Only for use in unittests.  Takes ownership of |index|.
-  void SetIndexForTesting(history::InMemoryURLIndex* index);
+  void set_index(history::InMemoryURLIndex* index);
+
   AutocompleteInput autocomplete_input_;
   std::string languages_;