| Index: chrome/browser/history/in_memory_history_backend.h
|
| diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
|
| index f06c3f6f4220e0726f7015ecbdb782e58a3dda45..86159673aebf12293e389f90f78bbf14217121bd 100644
|
| --- a/chrome/browser/history/in_memory_history_backend.h
|
| +++ b/chrome/browser/history/in_memory_history_backend.h
|
| @@ -45,8 +45,6 @@ struct KeywordSearchUpdatedDetails;
|
| struct KeywordSearchDeletedDetails;
|
| class URLDatabase;
|
| class URLRow;
|
| -struct URLsDeletedDetails;
|
| -struct URLsModifiedDetails;
|
|
|
| class InMemoryHistoryBackend : public HistoryServiceObserver,
|
| public content::NotificationObserver {
|
| @@ -74,6 +72,17 @@ class InMemoryHistoryBackend : public HistoryServiceObserver,
|
| return db_.get();
|
| }
|
|
|
| + // Notification callback.
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
| +
|
| + private:
|
| + FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, DeleteAll);
|
| + FRIEND_TEST_ALL_PREFIXES(InMemoryHistoryBackendTest, OnURLsDeletedEnMasse);
|
| + friend class HistoryBackendTestBase;
|
| + friend class InMemoryHistoryBackendTest;
|
| +
|
| // HistoryServiceObserver:
|
| void OnURLVisited(HistoryService* history_service,
|
| ui::PageTransition transition,
|
| @@ -82,21 +91,15 @@ class InMemoryHistoryBackend : public HistoryServiceObserver,
|
| base::Time visit_time) override;
|
| void OnURLsModified(HistoryService* history_service,
|
| const URLRows& changed_urls) override;
|
| -
|
| - // Notification callback.
|
| - void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| -
|
| - private:
|
| - FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, DeleteAll);
|
| + void OnURLsDeleted(HistoryService* history_service,
|
| + bool all_history,
|
| + bool expired,
|
| + const URLRows& deleted_rows,
|
| + const std::set<GURL>& favicon_urls) override;
|
|
|
| // Handler for HISTORY_URL_VISITED and HISTORY_URLS_MODIFIED.
|
| void OnURLVisitedOrModified(const URLRow& url_row);
|
|
|
| - // Handler for HISTORY_URLS_DELETED.
|
| - void OnURLsDeleted(const URLsDeletedDetails& details);
|
| -
|
| // Handler for HISTORY_KEYWORD_SEARCH_TERM_UPDATED.
|
| void OnKeywordSearchTermUpdated(const KeywordSearchUpdatedDetails& details);
|
|
|
|
|