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

chrome/browser/autocomplete/history_quick_provider_unittest.cc

Index: chrome/browser/autocomplete/history_quick_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/history_quick_provider_unittest.cc	(revision 111481)
+++ chrome/browser/autocomplete/history_quick_provider_unittest.cc	(working copy)
@@ -142,11 +142,14 @@
 }
 
 void HistoryQuickProviderTest::FillData() {
+  history::URLDatabase* db = history_service_->InMemoryDatabase();
+  ASSERT_TRUE(db != NULL);
+
   history::InMemoryURLIndex* index =
-      new history::InMemoryURLIndex(profile_.get(), FilePath());
+      new history::InMemoryURLIndex(FilePath());
   PrefService* prefs = profile_->GetPrefs();
   std::string languages(prefs->GetString(prefs::kAcceptLanguages));
-  index->Init(languages);
+  index->Init(db, languages);
   for (size_t i = 0; i < arraysize(quick_test_db); ++i) {
     const TestURLInfo& cur = quick_test_db[i];
     const GURL current_url(cur.url);
@@ -158,8 +161,7 @@
     url_info.set_typed_count(cur.typed_count);
     url_info.set_last_visit(visit_time);
     url_info.set_hidden(false);
-    url_info.set_id(i);
-    index->UpdateURL(url_info);
+    index->UpdateURL(i, url_info);
   }
 
   provider_->set_index(index);