Refactor sending NOTIFICATION_HISTORY_URL_VISITED

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"
@@ skipping 269 matching lines @@
       history_database_->FillVisitRow(statement, &row);
       base::Time last_visit = time_right_now;
       for (int64 i = row.visit_time.ToInternalValue(); i > 0; --i)
         last_visit -= day_delta;
       row.visit_time = last_visit;
       history_database_->UpdateVisitRow(row);
     }
     transaction.Commit();
   }
 
-  url_index_.reset(new InMemoryURLIndex(
-      &profile_, base::FilePath(), "en,ja,hi,zh",
-      history_service_->history_client()));
+  url_index_.reset(new InMemoryURLIndex(&profile_,
+                                        history_service_,
+                                        base::FilePath(),
+                                        "en,ja,hi,zh",
+                                        history_service_->history_client()));
   url_index_->Init();
   url_index_->RebuildFromHistory(history_database_);
 }
 
 base::FilePath::StringType InMemoryURLIndexTest::TestDBName() const {
     return FILE_PATH_LITERAL("url_history_provider_test.db.txt");
 }
 
 void InMemoryURLIndexTest::CheckTerm(
     const URLIndexPrivateData::SearchTermCacheMap& cache,
@@ skipping 136 matching lines @@
 }
 
 TEST_F(LimitedInMemoryURLIndexTest, Initialization) {
   // Verify that the database contains the expected number of items, which
   // is the pre-filtered count, i.e. all of the items.
   sql::Statement statement(GetDB().GetUniqueStatement("SELECT * FROM urls;"));
   ASSERT_TRUE(statement.is_valid());
   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",
-      history_service_->history_client()));
+  url_index_.reset(new InMemoryURLIndex(&profile_,
+                                        history_service_,
+                                        base::FilePath(),
+                                        "en,ja,hi,zh",
+                                        history_service_->history_client()));
   url_index_->Init();
   url_index_->RebuildFromHistory(history_database_);
   URLIndexPrivateData& private_data(*GetPrivateData());
 
   // history_info_map_ should have the same number of items as were filtered.
   EXPECT_EQ(1U, private_data.history_info_map_.size());
   EXPECT_EQ(35U, private_data.char_word_map_.size());
   EXPECT_EQ(17U, private_data.word_map_.size());
 }
 
@@ skipping 731 matching lines @@
 
   base::ScopedTempDir temp_dir_;
   scoped_ptr<InMemoryURLIndex> url_index_;
 };
 
 void InMemoryURLIndexCacheTest::SetUp() {
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   HistoryClient history_client;
   base::FilePath path(temp_dir_.path());
   url_index_.reset(new InMemoryURLIndex(
-      NULL, path, "en,ja,hi,zh", &history_client));
+      NULL, nullptr, path, "en,ja,hi,zh", &history_client));
 }
 
 void InMemoryURLIndexCacheTest::set_history_dir(
     const base::FilePath& dir_path) {
   return url_index_->set_history_dir(dir_path);
 }
 
 bool InMemoryURLIndexCacheTest::GetCacheFilePath(
     base::FilePath* file_path) const {
   DCHECK(file_path);
@@ skipping 11 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