Revert 105300 - 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 105312)
+++ chrome/browser/autocomplete/history_quick_provider.h	(working copy)
@@ -37,6 +37,9 @@
 
   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
@@ -49,9 +52,6 @@
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Spans);
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Relevance);
 
-  // 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,8 +81,7 @@
       bool is_url);
 
   // Only for use in unittests.  Takes ownership of |index|.
-  void set_index(history::InMemoryURLIndex* index);
-
+  void SetIndexForTesting(history::InMemoryURLIndex* index);
   AutocompleteInput autocomplete_input_;
   std::string languages_;