Componentize ScoredHistoryMatch

chrome/browser/history/in_memory_url_index_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 <algorithm>
 #include <fstream>
 
 #include "base/auto_reset.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/autocomplete/scored_history_match_builder_impl.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/url_index_private_data.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/history_index_restore_observer.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
-#include "components/history/core/browser/history_client.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/in_memory_url_index_types.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "sql/transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
-namespace {
-const size_t kMaxMatches = 3;
-const char kTestLanguages[] = "en,ja,hi,zh";
-}  // namespace
-
 // The test version of the history url database table ('url') is contained in
 // a database file created from a text file('url_history_provider_test.db.txt').
 // The only difference between this table and a live 'urls' table from a
 // profile is that the last_visit_time column in the test table contains a
 // number specifying the number of days relative to 'today' to which the
 // absolute time should be set during the test setup stage.
 //
 // The format of the test database text file is of a SQLite .dump file.
 // Note that only lines whose first character is an upper-case letter are
 // processed when creating the test database.
 
 namespace history {
+namespace {
+const size_t kMaxMatches = 3;
+const char kTestLanguages[] = "en,ja,hi,zh";
+}  // namespace
 
 // -----------------------------------------------------------------------------
 
 // Observer class so the unit tests can wait while the cache is being saved.
 class CacheFileSaverObserver : public InMemoryURLIndex::SaveCacheObserver {
  public:
   explicit CacheFileSaverObserver(const base::Closure& task);
 
   bool succeeded() { return succeeded_; }
 
@@ skipping 60 matching lines @@
   // Pass-through functions to simplify our friendship with URLIndexPrivateData.
   bool UpdateURL(const URLRow& row);
   bool DeleteURL(const GURL& url);
 
   // Data verification helper functions.
   void ExpectPrivateDataNotEmpty(const URLIndexPrivateData& data);
   void ExpectPrivateDataEmpty(const URLIndexPrivateData& data);
   void ExpectPrivateDataEqual(const URLIndexPrivateData& expected,
                               const URLIndexPrivateData& actual);
 
+  ScoredHistoryMatchBuilderImpl builder_;
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<InMemoryURLIndex> url_index_;
   TestingProfile profile_;
   HistoryService* history_service_;
   HistoryDatabase* history_database_;
 };
 
-InMemoryURLIndexTest::InMemoryURLIndexTest() {
+InMemoryURLIndexTest::InMemoryURLIndexTest()
+    : builder_(ScoredHistoryMatchBuilderImpl::IsBookmarkedCallback()),

[Mark P, 2015/02/07 07:00:13]

Does this construct an empty callback to pass to builder_'s constructor?

[sdefresne, 2015/02/09 10:01:14]

Yes, as those tests does not bookmark any URL. The
ScoredHistoryMatchBuilderImpl::Build supports null callback (see the
is_bookmarked.is_null() check in the implementation). Should I instead provide
another constructor for ScoredHistoryMatchBuilderImpl that does not take any
parameter and use an unbound callback?

+      history_service_(nullptr),
+      history_database_(nullptr) {
 }
 
 sql::Connection& InMemoryURLIndexTest::GetDB() {
   return history_database_->GetDB();
 }
 
 URLIndexPrivateData* InMemoryURLIndexTest::GetPrivateData() const {
   DCHECK(url_index_->private_data());
   return url_index_->private_data();
 }
@@ skipping 143 matching lines @@
 base::FilePath::StringType InMemoryURLIndexTest::TestDBName() const {
     return FILE_PATH_LITERAL("url_history_provider_test.db.txt");
 }
 
 bool InMemoryURLIndexTest::InitializeInMemoryURLIndexInSetUp() const {
   return true;
 }
 
 void InMemoryURLIndexTest::InitializeInMemoryURLIndex() {
   DCHECK(!url_index_);
-  url_index_.reset(new InMemoryURLIndex(history_service_, base::FilePath(),
-                                        kTestLanguages,
-                                        history_service_->history_client()));
+  url_index_.reset(
+      new InMemoryURLIndex(history_service_, base::FilePath(), kTestLanguages));
   url_index_->Init();
   url_index_->RebuildFromHistory(history_database_);
 }
 
 void InMemoryURLIndexTest::CheckTerm(
     const URLIndexPrivateData::SearchTermCacheMap& cache,
     base::string16 term) const {
   URLIndexPrivateData::SearchTermCacheMap::const_iterator cache_iter(
       cache.find(term));
   ASSERT_TRUE(cache.end() != cache_iter)
@@ skipping 156 matching lines @@
 
 #if defined(OS_WIN)
 // Flaky on windows trybots: http://crbug.com/351500
 #define MAYBE_Retrieval DISABLED_Retrieval
 #else
 #define MAYBE_Retrieval Retrieval
 #endif
 TEST_F(InMemoryURLIndexTest, MAYBE_Retrieval) {
   // See if a very specific term gives a single result.
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches,
+      builder_);
   ASSERT_EQ(1U, matches.size());
 
   // Verify that we got back the result we expected.
   EXPECT_EQ(5, matches[0].url_info.id());
   EXPECT_EQ("http://drudgereport.com/", matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16("DRUDGE REPORT 2010"), matches[0].url_info.title());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // Make sure a trailing space prevents inline-ability but still results
   // in the expected result.
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudgeReport "), base::string16::npos, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("DrudgeReport "),
+                                             base::string16::npos, kMaxMatches,
+                                             builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(5, matches[0].url_info.id());
   EXPECT_EQ("http://drudgereport.com/", matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16("DRUDGE REPORT 2010"), matches[0].url_info.title());
-  EXPECT_FALSE(matches[0].can_inline());
+  EXPECT_FALSE(matches[0].can_inline);
 
   // Search which should result in multiple results.
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("drudge"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("drudge"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(2U, matches.size());
   // The results should be in descending score order.
-  EXPECT_GE(matches[0].raw_score(), matches[1].raw_score());
+  EXPECT_GE(matches[0].raw_score, matches[1].raw_score);
 
   // Search which should result in nearly perfect result.
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("Nearly Perfect Result"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("Nearly Perfect Result"), base::string16::npos, kMaxMatches,
+      builder_);
   ASSERT_EQ(1U, matches.size());
   // The results should have a very high score.
-  EXPECT_GT(matches[0].raw_score(), 900);
+  EXPECT_GT(matches[0].raw_score, 900);
   EXPECT_EQ(32, matches[0].url_info.id());
   EXPECT_EQ("https://nearlyperfectresult.com/",
             matches[0].url_info.url().spec());  // Note: URL gets lowercased.
   EXPECT_EQ(ASCIIToUTF16("Practically Perfect Search Result"),
             matches[0].url_info.title());
-  EXPECT_FALSE(matches[0].can_inline());
+  EXPECT_FALSE(matches[0].can_inline);
 
   // Search which should result in very poor result.
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("qui c"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("qui c"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   // The results should have a poor score.
-  EXPECT_LT(matches[0].raw_score(), 500);
+  EXPECT_LT(matches[0].raw_score, 500);
   EXPECT_EQ(33, matches[0].url_info.id());
   EXPECT_EQ("http://quiteuselesssearchresultxyz.com/",
             matches[0].url_info.url().spec());  // Note: URL gets lowercased.
   EXPECT_EQ(ASCIIToUTF16("Practically Useless Search Result"),
             matches[0].url_info.title());
-  EXPECT_FALSE(matches[0].can_inline());
+  EXPECT_FALSE(matches[0].can_inline);
 
   // Search which will match at the end of an URL with encoded characters.
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("Mice"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("Mice"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(30, matches[0].url_info.id());
-  EXPECT_FALSE(matches[0].can_inline());
+  EXPECT_FALSE(matches[0].can_inline);
 
   // Check that URLs are not escaped an escape time.
-  matches = url_index_->HistoryItemsForTerms(
-       ASCIIToUTF16("1% wikipedia"), base::string16::npos, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("1% wikipedia"),
+                                             base::string16::npos, kMaxMatches,
+                                             builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(35, matches[0].url_info.id());
   EXPECT_EQ("http://en.wikipedia.org/wiki/1%25_rule_(Internet_culture)",
             matches[0].url_info.url().spec());
 
   // Verify that a single term can appear multiple times in the URL and as long
   // as one starts the URL it is still inlined.
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("fubar"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("fubar"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(34, matches[0].url_info.id());
   EXPECT_EQ("http://fubarfubarandfubar.com/", matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16("Situation Normal -- FUBARED"),
             matches[0].url_info.title());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 }
 
 TEST_F(InMemoryURLIndexTest, CursorPositionRetrieval) {
   // See if a very specific term with no cursor gives an empty result.
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudReport"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("DrudReport"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(0U, matches.size());
 
   // The same test with the cursor at the end should give an empty result.
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudReport"), 10u, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("DrudReport"), 10u,
+                                             kMaxMatches, builder_);
   ASSERT_EQ(0U, matches.size());
 
   // If the cursor is between Drud and Report, we should find the desired
   // result.
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudReport"), 4u, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("DrudReport"), 4u,
+                                             kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ("http://drudgereport.com/", matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16("DRUDGE REPORT 2010"), matches[0].url_info.title());
 
   // Now check multi-word inputs.  No cursor should fail to find a
   // result on this input.
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("MORTGAGERATE DROPS"), base::string16::npos, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("MORTGAGERATE DROPS"),
+                                             base::string16::npos, kMaxMatches,
+                                             builder_);
   ASSERT_EQ(0U, matches.size());
 
   // Ditto with cursor at end.
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("MORTGAGERATE DROPS"), 18u, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("MORTGAGERATE DROPS"),
+                                             18u, kMaxMatches, builder_);
   ASSERT_EQ(0U, matches.size());
 
   // If the cursor is between MORTAGE And RATE, we should find the
   // desired result.
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("MORTGAGERATE DROPS"), 8u, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("MORTGAGERATE DROPS"),
+                                             8u, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ("http://www.reuters.com/article/idUSN0839880620100708",
             matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16(
       "UPDATE 1-US 30-yr mortgage rate drops to new record low | Reuters"),
             matches[0].url_info.title());
 }
 
 TEST_F(InMemoryURLIndexTest, URLPrefixMatching) {
   // "drudgere" - found, can inline
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("drudgere"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("drudgere"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // "drudgere" - found, can inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("drudgere"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("drudgere"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // "www.atdmt" - not found
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("www.atdmt"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("www.atdmt"), base::string16::npos, kMaxMatches, builder_);
   EXPECT_EQ(0U, matches.size());
 
   // "atdmt" - found, cannot inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("atdmt"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("atdmt"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_FALSE(matches[0].can_inline());
+  EXPECT_FALSE(matches[0].can_inline);
 
   // "view.atdmt" - found, can inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("view.atdmt"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("view.atdmt"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // "view.atdmt" - found, can inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("view.atdmt"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("view.atdmt"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // "cnn.com" - found, can inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("cnn.com"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("cnn.com"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(2U, matches.size());
   // One match should be inline-able, the other not.
-  EXPECT_TRUE(matches[0].can_inline() != matches[1].can_inline());
+  EXPECT_TRUE(matches[0].can_inline != matches[1].can_inline);
 
   // "www.cnn.com" - found, can inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("www.cnn.com"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("www.cnn.com"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // "ww.cnn.com" - found because we allow mid-term matches in hostnames
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("ww.cnn.com"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("ww.cnn.com"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
 
   // "www.cnn.com" - found, can inline
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("www.cnn.com"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("www.cnn.com"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
-  EXPECT_TRUE(matches[0].can_inline());
+  EXPECT_TRUE(matches[0].can_inline);
 
   // "tp://www.cnn.com" - not found because we don't allow tp as a mid-term
   // match
-  matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("tp://www.cnn.com"), base::string16::npos, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(ASCIIToUTF16("tp://www.cnn.com"),
+                                             base::string16::npos, kMaxMatches,
+                                             builder_);
   ASSERT_EQ(0U, matches.size());
 }
 
 TEST_F(InMemoryURLIndexTest, ProperStringMatching) {
   // Search for the following with the expected results:
   // "atdmt view" - found
   // "atdmt.view" - not found
   // "view.atdmt" - found
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("atdmt view"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("atdmt view"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   matches = url_index_->HistoryItemsForTerms(
-       ASCIIToUTF16("atdmt.view"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("atdmt.view"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(0U, matches.size());
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("view.atdmt"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("view.atdmt"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
 }
 
 TEST_F(InMemoryURLIndexTest, HugeResultSet) {
   // Create a huge set of qualifying history items.
   for (URLID row_id = 5000; row_id < 6000; ++row_id) {
     URLRow new_row(GURL("http://www.brokeandaloneinmanitoba.com/"), row_id);
     new_row.set_last_visit(base::Time::Now());
     EXPECT_TRUE(UpdateURL(new_row));
   }
 
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("b"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("b"), base::string16::npos, kMaxMatches, builder_);
   URLIndexPrivateData& private_data(*GetPrivateData());
   ASSERT_EQ(kMaxMatches, matches.size());
   // There are 7 matches already in the database.
   ASSERT_EQ(1008U, private_data.pre_filter_item_count_);
   ASSERT_EQ(500U, private_data.post_filter_item_count_);
   ASSERT_EQ(kMaxMatches, private_data.post_scoring_item_count_);
 }
 
 #if defined(OS_WIN)
 // Flaky on windows trybots: http://crbug.com/351500
 #define MAYBE_TitleSearch DISABLED_TitleSearch
 #else
 #define MAYBE_TitleSearch TitleSearch
 #endif
 TEST_F(InMemoryURLIndexTest, MAYBE_TitleSearch) {
   // Signal if someone has changed the test DB.
   EXPECT_EQ(29U, GetPrivateData()->history_info_map_.size());
 
   // Ensure title is being searched.
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("MORTGAGE RATE DROPS"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("MORTGAGE RATE DROPS"), base::string16::npos, kMaxMatches,
+      builder_);
   ASSERT_EQ(1U, matches.size());
 
   // Verify that we got back the result we expected.
   EXPECT_EQ(1, matches[0].url_info.id());
   EXPECT_EQ("http://www.reuters.com/article/idUSN0839880620100708",
             matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16(
       "UPDATE 1-US 30-yr mortgage rate drops to new record low | Reuters"),
       matches[0].url_info.title());
 }
 
 TEST_F(InMemoryURLIndexTest, TitleChange) {
   // Verify current title terms retrieves desired item.
   base::string16 original_terms =
       ASCIIToUTF16("lebronomics could high taxes influence");
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      original_terms, base::string16::npos, kMaxMatches);
+      original_terms, base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
 
   // Verify that we got back the result we expected.
   const URLID expected_id = 3;
   EXPECT_EQ(expected_id, matches[0].url_info.id());
   EXPECT_EQ("http://www.businessandmedia.org/articles/2010/20100708120415.aspx",
             matches[0].url_info.url().spec());
   EXPECT_EQ(ASCIIToUTF16(
       "LeBronomics: Could High Taxes Influence James' Team Decision?"),
       matches[0].url_info.title());
   URLRow old_row(matches[0].url_info);
 
   // Verify new title terms retrieves nothing.
   base::string16 new_terms = ASCIIToUTF16("does eat oats little lambs ivy");
-  matches = url_index_->HistoryItemsForTerms(
-      new_terms, base::string16::npos, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(new_terms, base::string16::npos,
+                                             kMaxMatches, builder_);
   ASSERT_EQ(0U, matches.size());
 
   // Update the row.
   old_row.set_title(ASCIIToUTF16("Does eat oats and little lambs eat ivy"));
   EXPECT_TRUE(UpdateURL(old_row));
 
   // Verify we get the row using the new terms but not the original terms.
-  matches = url_index_->HistoryItemsForTerms(
-      new_terms, base::string16::npos, kMaxMatches);
+  matches = url_index_->HistoryItemsForTerms(new_terms, base::string16::npos,
+                                             kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(expected_id, matches[0].url_info.id());
   matches = url_index_->HistoryItemsForTerms(
-      original_terms, base::string16::npos, kMaxMatches);
+      original_terms, base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(0U, matches.size());
 }
 
 TEST_F(InMemoryURLIndexTest, NonUniqueTermCharacterSets) {
   // The presence of duplicate characters should succeed. Exercise by cycling
   // through a string with several duplicate characters.
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("ABRA"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("ABRA"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(28, matches[0].url_info.id());
   EXPECT_EQ("http://www.ddj.com/windows/184416623",
             matches[0].url_info.url().spec());
 
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("ABRACAD"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("ABRACAD"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(28, matches[0].url_info.id());
 
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("ABRACADABRA"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("ABRACADABRA"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(28, matches[0].url_info.id());
 
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("ABRACADABR"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("ABRACADABR"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(28, matches[0].url_info.id());
 
   matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("ABRACA"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("ABRACA"), base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(1U, matches.size());
   EXPECT_EQ(28, matches[0].url_info.id());
 }
 
 TEST_F(InMemoryURLIndexTest, TypedCharacterCaching) {
   // Verify that match results for previously typed characters are retained
   // (in the term_char_word_set_cache_) and reused, if possible, in future
   // autocompletes.
 
   URLIndexPrivateData::SearchTermCacheMap& cache(
       GetPrivateData()->search_term_cache_);
 
   // The cache should be empty at this point.
   EXPECT_EQ(0U, cache.size());
 
   // Now simulate typing search terms into the omnibox and check the state of
   // the cache as each item is 'typed'.
 
   // Simulate typing "r" giving "r" in the simulated omnibox. The results for
   // 'r' will be not cached because it is only 1 character long.
-  url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("r"), base::string16::npos, kMaxMatches);
+  url_index_->HistoryItemsForTerms(ASCIIToUTF16("r"), base::string16::npos,
+                                   kMaxMatches, builder_);
   EXPECT_EQ(0U, cache.size());
 
   // Simulate typing "re" giving "r re" in the simulated omnibox.
   // 're' should be cached at this point but not 'r' as it is a single
   // character.
-  url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("r re"), base::string16::npos, kMaxMatches);
+  url_index_->HistoryItemsForTerms(ASCIIToUTF16("r re"), base::string16::npos,
+                                   kMaxMatches, builder_);
   ASSERT_EQ(1U, cache.size());
   CheckTerm(cache, ASCIIToUTF16("re"));
 
   // Simulate typing "reco" giving "r re reco" in the simulated omnibox.
   // 're' and 'reco' should be cached at this point but not 'r' as it is a
   // single character.
-  url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("r re reco"), base::string16::npos, kMaxMatches);
+  url_index_->HistoryItemsForTerms(ASCIIToUTF16("r re reco"),
+                                   base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(2U, cache.size());
   CheckTerm(cache, ASCIIToUTF16("re"));
   CheckTerm(cache, ASCIIToUTF16("reco"));
 
   // Simulate typing "mort".
   // Since we now have only one search term, the cached results for 're' and
   // 'reco' should be purged, giving us only 1 item in the cache (for 'mort').
-  url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("mort"), base::string16::npos, kMaxMatches);
+  url_index_->HistoryItemsForTerms(ASCIIToUTF16("mort"), base::string16::npos,
+                                   kMaxMatches, builder_);
   ASSERT_EQ(1U, cache.size());
   CheckTerm(cache, ASCIIToUTF16("mort"));
 
   // Simulate typing "reco" giving "mort reco" in the simulated omnibox.
-  url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("mort reco"), base::string16::npos, kMaxMatches);
+  url_index_->HistoryItemsForTerms(ASCIIToUTF16("mort reco"),
+                                   base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(2U, cache.size());
   CheckTerm(cache, ASCIIToUTF16("mort"));
   CheckTerm(cache, ASCIIToUTF16("reco"));
 
   // Simulate a <DELETE> by removing the 'reco' and adding back the 'rec'.
-  url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("mort rec"), base::string16::npos, kMaxMatches);
+  url_index_->HistoryItemsForTerms(ASCIIToUTF16("mort rec"),
+                                   base::string16::npos, kMaxMatches, builder_);
   ASSERT_EQ(2U, cache.size());
   CheckTerm(cache, ASCIIToUTF16("mort"));
   CheckTerm(cache, ASCIIToUTF16("rec"));
 }
 
 TEST_F(InMemoryURLIndexTest, AddNewRows) {
   // Verify that the row we're going to add does not already exist.
   URLID new_row_id = 87654321;
   // Newly created URLRows get a last_visit time of 'right now' so it should
   // qualify as a quick result candidate.
-  EXPECT_TRUE(url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("brokeandalone"), base::string16::npos, kMaxMatches)
-          .empty());
+  EXPECT_TRUE(url_index_->HistoryItemsForTerms(ASCIIToUTF16("brokeandalone"),
+                                               base::string16::npos,
+                                               kMaxMatches, builder_).empty());
 
   // Add a new row.
   URLRow new_row(GURL("http://www.brokeandaloneinmanitoba.com/"), new_row_id++);
   new_row.set_last_visit(base::Time::Now());
   EXPECT_TRUE(UpdateURL(new_row));
 
   // Verify that we can retrieve it.
-  EXPECT_EQ(1U, url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("brokeandalone"), base::string16::npos, kMaxMatches).size());
+  EXPECT_EQ(1U, url_index_->HistoryItemsForTerms(ASCIIToUTF16("brokeandalone"),
+                                                 base::string16::npos,
+                                                 kMaxMatches, builder_).size());
 
   // Add it again just to be sure that is harmless and that it does not update
   // the index.
   EXPECT_FALSE(UpdateURL(new_row));
-  EXPECT_EQ(1U, url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("brokeandalone"), base::string16::npos, kMaxMatches).size());
+  EXPECT_EQ(1U, url_index_->HistoryItemsForTerms(ASCIIToUTF16("brokeandalone"),
+                                                 base::string16::npos,
+                                                 kMaxMatches, builder_).size());
 
   // Make up an URL that does not qualify and try to add it.
   URLRow unqualified_row(GURL("http://www.brokeandaloneinmanitoba.com/"),
                          new_row_id++);
   EXPECT_FALSE(UpdateURL(new_row));
 }
 
 TEST_F(InMemoryURLIndexTest, DeleteRows) {
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches,
+      builder_);
   ASSERT_EQ(1U, matches.size());
 
   // Delete the URL then search again.
   EXPECT_TRUE(DeleteURL(matches[0].url_info.url()));
-  EXPECT_TRUE(url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches).empty());
+  EXPECT_TRUE(url_index_->HistoryItemsForTerms(ASCIIToUTF16("DrudgeReport"),
+                                               base::string16::npos,
+                                               kMaxMatches, builder_).empty());
 
   // Make up an URL that does not exist in the database and delete it.
   GURL url("http://www.hokeypokey.com/putyourrightfootin.html");
   EXPECT_FALSE(DeleteURL(url));
 }
 
 TEST_F(InMemoryURLIndexTest, ExpireRow) {
   ScoredHistoryMatches matches = url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches);
+      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches,
+      builder_);
   ASSERT_EQ(1U, matches.size());
 
   // Determine the row id for the result, remember that id, broadcast a
   // delete notification, then ensure that the row has been deleted.
   URLRows deleted_rows;
   deleted_rows.push_back(matches[0].url_info);
   url_index_->OnURLsDeleted(nullptr, false, false, deleted_rows,
                             std::set<GURL>());
-  EXPECT_TRUE(url_index_->HistoryItemsForTerms(
-      ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches).empty());
+  EXPECT_TRUE(url_index_->HistoryItemsForTerms(ASCIIToUTF16("DrudgeReport"),
+                                               base::string16::npos,
+                                               kMaxMatches, builder_).empty());
 }
 
 TEST_F(InMemoryURLIndexTest, WhitelistedURLs) {
   struct TestData {
     const std::string url_spec;
     const bool expected_is_whitelisted;
   } data[] = {
     // URLs with whitelisted schemes.
     { "about:histograms", true },
     { "chrome://settings", true },
@@ skipping 275 matching lines @@
   void set_history_dir(const base::FilePath& dir_path);
   bool GetCacheFilePath(base::FilePath* file_path) const;
 
   base::ScopedTempDir temp_dir_;
   scoped_ptr<InMemoryURLIndex> url_index_;
 };
 
 void InMemoryURLIndexCacheTest::SetUp() {
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   base::FilePath path(temp_dir_.path());
-  url_index_.reset(
-      new InMemoryURLIndex(nullptr, path, kTestLanguages, nullptr));
+  url_index_.reset(new InMemoryURLIndex(nullptr, path, kTestLanguages));
 }
 
 void InMemoryURLIndexCacheTest::TearDown() {
   if (url_index_)
     url_index_->ShutDown();
 }
 
 void InMemoryURLIndexCacheTest::set_history_dir(
     const base::FilePath& dir_path) {
   return url_index_->set_history_dir(dir_path);
@@ skipping 16 matching lines @@
   full_file_path.GetComponents(&actual_parts);
   ASSERT_EQ(expected_parts.size(), actual_parts.size());
   size_t count = expected_parts.size();
   for (size_t i = 0; i < count; ++i)
     EXPECT_EQ(expected_parts[i], actual_parts[i]);
   // Must clear the history_dir_ to satisfy the dtor's DCHECK.
   set_history_dir(base::FilePath());
 }
 
 }  // namespace history