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

chrome/browser/history/history.h

Index: chrome/browser/history/history.h
===================================================================
--- chrome/browser/history/history.h	(revision 111481)
+++ chrome/browser/history/history.h	(working copy)
@@ -143,8 +143,8 @@
   // TODO(brettw) this should return the InMemoryHistoryBackend.
   history::URLDatabase* InMemoryDatabase();
 
-  // Returns the history database if it has been set, otherwise NULL.
-  history::URLDatabase* HistoryDatabase();
+  // Return the quick history index.
+  history::InMemoryURLIndex* InMemoryIndex();
 
   // Navigation ----------------------------------------------------------------
 
@@ -502,11 +502,6 @@
       CancelableRequestConsumerBase* consumer,
       const GetMostRecentKeywordSearchTermsCallback& callback);
 
-  // InMemoryURLIndex ----------------------------------------------------------
-
-  // Returns the quick history index.
-  history::InMemoryURLIndex* InMemoryIndex();
-
   // Bookmarks -----------------------------------------------------------------
 
   // Notification that a URL is no longer bookmarked.
@@ -850,9 +845,6 @@
   // on the background thread.
   scoped_ptr<history::InMemoryHistoryBackend> in_memory_backend_;
 
-  // The index used for quick history lookups.
-  scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
-
   // The profile, may be null when testing.
   Profile* profile_;