Abstract history dependencies on bookmarks through HistoryClient

chrome/browser/history/history_querying_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 145 matching lines @@
     history_->SetPageTitle(url, base::UTF8ToUTF16(entry.title));
   }
 
  private:
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     history_dir_ = temp_dir_.path().AppendASCII("HistoryTest");
     ASSERT_TRUE(base::CreateDirectory(history_dir_));
 
     history_.reset(new HistoryService);
-    if (!history_->Init(history_dir_, NULL)) {
+    if (!history_->Init(history_dir_)) {
       history_.reset();  // Tests should notice this NULL ptr & fail.
       return;
     }
 
     // Fill the test data.
     Time now = Time::Now().LocalMidnight();
     for (size_t i = 0; i < arraysize(test_entries); i++) {
       test_entries[i].time =
           now - (test_entries[i].days_ago * TimeDelta::FromDays(1));
       AddEntryToHistory(test_entries[i]);
@@ skipping 302 matching lines @@
 
 TEST_F(HistoryQueryTest, TextSearchPaging) {
   // Since results are fetched 1 and 2 at a time, entry #0 and #6 will not
   // be de-duplicated. Entry #4 does not contain the text "title", so it
   // shouldn't appear.
   int expected_results[] = { 2, 3, 1, 7, 6, 5 };
   TestPaging("title", expected_results, arraysize(expected_results));
 }
 
 }  // namespace history