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 103712)
+++ chrome/browser/history/history_backend.h	(working copy)
@@ -26,6 +26,7 @@
 
 class BookmarkService;
 struct DownloadPersistentStoreInfo;
+class Profile;
 class TestingProfile;
 struct ThumbnailScore;
 
@@ -103,7 +104,8 @@
   // may be NULL.
   //
   // This constructor is fast and does no I/O, so can be called at any time.
-  HistoryBackend(const FilePath& history_dir,
+  HistoryBackend(Profile* profile,
+                 const FilePath& history_dir,
                  int id,
                  Delegate* delegate,
                  BookmarkService* bookmark_service);
@@ -112,9 +114,9 @@
   // fails, all other functions will fail as well. (Since this runs on another
   // thread, we don't bother returning failure.)
   //
-  // |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.
+  // |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.
   void Init(const std::string& languages, bool force_fail);
 
   // Notification that the history system is shutting down. This will break
@@ -256,6 +258,13 @@
                               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,
@@ -541,6 +550,8 @@
 
   // Data ----------------------------------------------------------------------
 
+  Profile* profile_;  // The profile may be NULL during unittests.

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

Where do you use this?

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

Only for initializing the InMemoryURLIndex instance, which takes place in the
ctor, so I've removed the data member.

On 2011/10/05 00:11:42, Peter Kasting wrote:

+
   // Delegate. See the class definition above for more information. This will
   // be NULL before Init is called and after Cleanup, but is guaranteed
   // non-NULL in between.
@@ -567,6 +578,9 @@
   // 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_;