Revert 105300 - HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/autocomplete/history_quick_provider.cc

Index: chrome/browser/autocomplete/history_quick_provider.cc
===================================================================
--- chrome/browser/autocomplete/history_quick_provider.cc	(revision 105312)
+++ chrome/browser/autocomplete/history_quick_provider.cc	(working copy)
@@ -16,7 +16,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/in_memory_url_index.h"
-#include "chrome/browser/history/in_memory_url_index_types.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -82,7 +81,8 @@
   }
 }
 
-// TODO(mrossetti): Implement this function. (Will happen in next CL.)
+// HistoryQuickProvider matches are currently not deletable.
+// TODO(mrossetti): Determine when a match should be deletable.
 void HistoryQuickProvider::DeleteMatch(const AutocompleteMatch& match) {}
 
 void HistoryQuickProvider::DoAutocomplete() {
@@ -90,8 +90,8 @@
   string16 term_string = autocomplete_input_.text();
   term_string = net::UnescapeURLComponent(term_string,
       UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
-  history::String16Vector terms(
-      history::String16VectorFromString16(term_string, false));
+  history::InMemoryURLIndex::String16Vector terms(
+      InMemoryURLIndex::WordVectorFromString16(term_string, false));
   ScoredHistoryMatches matches = GetIndex()->HistoryItemsForTerms(terms);
   if (matches.empty())
     return;
@@ -131,12 +131,13 @@
 
   // Format the URL autocomplete presentation.
   std::vector<size_t> offsets =
-      history::OffsetsFromTermMatches(history_match.url_matches);
+      InMemoryURLIndex::OffsetsFromTermMatches(history_match.url_matches);
   match.contents =
       net::FormatUrlWithOffsets(info.url(), languages_, net::kFormatUrlOmitAll,
                                 UnescapeRule::SPACES, NULL, NULL, &offsets);
   history::TermMatches new_matches =
-      ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
+      InMemoryURLIndex::ReplaceOffsetsInTermMatches(history_match.url_matches,
+                                                    offsets);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
   match.fill_into_edit = match.contents;
@@ -169,8 +170,7 @@
   return history_service->InMemoryIndex();
 }
 
-// TODO(mrossetti): This will be inlined in the next CL.
-void HistoryQuickProvider::set_index(
+void HistoryQuickProvider::SetIndexForTesting(
     history::InMemoryURLIndex* index) {
   DCHECK(index);
   index_for_testing_.reset(index);