Abstract history dependencies on bookmarks through HistoryClient

chrome/browser/history/in_memory_url_index.h

Index: chrome/browser/history/in_memory_url_index.h
diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h
index c6bf3078b02fb0dcf81744731023b68c16e00f0c..6cac701b8032671f32e1c0611f982df8d2c7fcf2 100644
--- a/chrome/browser/history/in_memory_url_index.h
+++ b/chrome/browser/history/in_memory_url_index.h
@@ -41,6 +41,7 @@ namespace history {
 
 namespace imui = in_memory_url_index;
 
+class HistoryClient;
 class HistoryDatabase;
 class URLIndexPrivateData;
 struct URLsDeletedDetails;
@@ -100,7 +101,8 @@ class InMemoryURLIndex : public content::NotificationObserver,
   // which URLs and omnibox searches are broken down into words and characters.
   InMemoryURLIndex(Profile* profile,
                    const base::FilePath& history_dir,
-                   const std::string& languages);
+                   const std::string& languages,
+                   HistoryClient* client);
   virtual ~InMemoryURLIndex();
 
   // Opens and prepares the index of historical URL visits. If the index private
@@ -252,6 +254,9 @@ class InMemoryURLIndex : public content::NotificationObserver,
   // The profile, may be null when testing.
   Profile* profile_;
 
+  // The HistoryClient; may be NULL when testing.
+  HistoryClient* history_client_;
+
   // Directory where cache file resides. This is, except when unit testing,
   // the same directory in which the profile's history database is found. It
   // should never be empty.