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

chrome/browser/history/history_backend.h

Index: chrome/browser/history/history_backend.h
===================================================================
--- chrome/browser/history/history_backend.h	(revision 105312)
+++ chrome/browser/history/history_backend.h	(working copy)
@@ -27,7 +27,6 @@
 
 class BookmarkService;
 struct DownloadPersistentStoreInfo;
-class Profile;
 class TestingProfile;
 struct ThumbnailScore;
 
@@ -105,8 +104,7 @@
   // may be NULL.
   //
   // This constructor is fast and does no I/O, so can be called at any time.
-  HistoryBackend(Profile* profile,
-                 const FilePath& history_dir,
+  HistoryBackend(const FilePath& history_dir,
                  int id,
                  Delegate* delegate,
                  BookmarkService* bookmark_service);
@@ -115,9 +113,9 @@
   // fails, all other functions will fail as well. (Since this runs on another
   // thread, we don't bother returning failure.)
   //
-  // |languages| gives the languages used to break search terms and history
-  // page titles into separate words. |force_fail| can be set during unittests
-  // to unconditionally fail to init.
+  // |languages| gives a list of language encodings with which the history
+  // URLs and omnibox searches are interpreted.
+  // |force_fail| can be set during unittests to unconditionally fail to init.
   void Init(const std::string& languages, bool force_fail);
 
   // Notification that the history system is shutting down. This will break
@@ -259,13 +257,6 @@
                               const base::Time remove_end);
   void RemoveDownloads(const base::Time remove_end);
 
-  // InMemoryURLIndex ----------------------------------------------------------
-
-  // Returns the quick history index.
-  history::InMemoryURLIndex* InMemoryIndex() const {
-    return in_memory_url_index_.get();
-  }
-
   // Segment usage -------------------------------------------------------------
 
   void QuerySegmentUsage(scoped_refptr<QuerySegmentUsageRequest> request,
@@ -578,9 +569,6 @@
   // created.
   scoped_ptr<TextDatabaseManager> text_database_;
 
-  // The index used for quick history lookups.
-  scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
-
   // Manages expiration between the various databases.
   ExpireHistoryBackend expirer_;