| 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 59f8a804c11be5f79ef15a11f9235578da58cb90..6143889abc95dfcef8d0ec30bd35bbc906ccd8d6 100644
|
| --- a/chrome/browser/history/in_memory_url_index_unittest.cc
|
| +++ b/chrome/browser/history/in_memory_url_index_unittest.cc
|
| @@ -29,8 +29,6 @@
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "components/bookmarks/test/bookmark_test_helpers.h"
|
| #include "components/history/core/browser/history_client.h"
|
| -#include "content/public/browser/notification_details.h"
|
| -#include "content/public/browser/notification_source.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "sql/transaction.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -113,9 +111,6 @@ class InMemoryURLIndexTest : public testing::Test {
|
| bool GetCacheFilePath(base::FilePath* file_path) const;
|
| void PostRestoreFromCacheFileTask();
|
| void PostSaveToCacheFileTask();
|
| - void Observe(int notification_type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details);
|
| const std::set<std::string>& scheme_whitelist();
|
|
|
|
|
| @@ -176,13 +171,6 @@ void InMemoryURLIndexTest::PostSaveToCacheFileTask() {
|
| url_index_->PostSaveToCacheFileTask();
|
| }
|
|
|
| -void InMemoryURLIndexTest::Observe(
|
| - int notification_type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) {
|
| - url_index_->Observe(notification_type, source, details);
|
| -}
|
| -
|
| const std::set<std::string>& InMemoryURLIndexTest::scheme_whitelist() {
|
| return url_index_->scheme_whitelist();
|
| }
|
| @@ -902,9 +890,7 @@ TEST_F(InMemoryURLIndexTest, ExpireRow) {
|
| URLsDeletedDetails deleted_details;
|
| deleted_details.all_history = false;
|
| deleted_details.rows.push_back(matches[0].url_info);
|
| - Observe(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
|
| - content::Source<InMemoryURLIndexTest>(this),
|
| - content::Details<history::HistoryDetails>(&deleted_details));
|
| + url_index_->OnURLsDeleted(nullptr, deleted_details);
|
| EXPECT_TRUE(url_index_->HistoryItemsForTerms(
|
| ASCIIToUTF16("DrudgeReport"), base::string16::npos, kMaxMatches).empty());
|
| }
|
|
|