Abstract history dependencies on bookmarks through HistoryClient

chrome/browser/history/in_memory_url_index_unittest.cc

Index: chrome/browser/history/in_memory_url_index_unittest.cc
diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc
index ba06b219ea101b9d52704eb5309fe92390123770..857c5f161751bb842947ace6fb7c2804c1c51bc3 100644
--- a/chrome/browser/history/in_memory_url_index_unittest.cc
+++ b/chrome/browser/history/in_memory_url_index_unittest.cc
@@ -29,6 +29,7 @@
 #include "chrome/test/base/history_index_restore_observer.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/core/test/bookmark_test_helpers.h"
+#include "components/history/core/browser/test_history_client.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread.h"
@@ -274,8 +275,9 @@ void InMemoryURLIndexTest::SetUp() {
     transaction.Commit();
   }
 
-  url_index_.reset(
-      new InMemoryURLIndex(&profile_, base::FilePath(), "en,ja,hi,zh"));
+  url_index_.reset(new InMemoryURLIndex(
+      &profile_, base::FilePath(), "en,ja,hi,zh",
+      history_service_->history_client()));
   url_index_->Init();
   url_index_->RebuildFromHistory(history_database_);
 }
@@ -432,8 +434,9 @@ TEST_F(LimitedInMemoryURLIndexTest, Initialization) {
   uint64 row_count = 0;
   while (statement.Step()) ++row_count;
   EXPECT_EQ(1U, row_count);
-  url_index_.reset(
-      new InMemoryURLIndex(&profile_, base::FilePath(), "en,ja,hi,zh"));
+  url_index_.reset(new InMemoryURLIndex(
+      &profile_, base::FilePath(), "en,ja,hi,zh",
+      history_service_->history_client()));
   url_index_->Init();
   url_index_->RebuildFromHistory(history_database_);
   URLIndexPrivateData& private_data(*GetPrivateData());
@@ -1150,9 +1153,10 @@ class InMemoryURLIndexCacheTest : public testing::Test {
 
 void InMemoryURLIndexCacheTest::SetUp() {
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+  TestHistoryClient history_client;
   base::FilePath path(temp_dir_.path());
-  url_index_.reset(
-      new InMemoryURLIndex(NULL, path, "en,ja,hi,zh"));
+  url_index_.reset(new InMemoryURLIndex(
+      NULL, path, "en,ja,hi,zh", &history_client));
 }
 
 void InMemoryURLIndexCacheTest::set_history_dir(