Migrate HistoryServiceObservers in components/history/

Change HistoryServiceObservers to use the new OnUrlsDeleted method.

Bug: 839798
Change-Id: Ia5e01bcf60a43d7b1112f69f816a06e9ae1e51ab
Reviewed-on: https://chromium-review.googlesource.com/1051767Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558232}

components/history/core/browser/browsing_history_service.cc

@@ -742,11 +742,9 @@ static bool DeletionsDiffer(const URLRows& deleted_rows,
 }
 
 void BrowsingHistoryService::OnURLsDeleted(HistoryService* history_service,
-                                           bool all_history,
-                                           bool expired,
-                                           const URLRows& deleted_rows,
-                                           const std::set<GURL>& favicon_urls) {
-  if (all_history || DeletionsDiffer(deleted_rows, urls_to_be_deleted_))
+                                           const DeletionInfo& deletion_info) {
+  if (deletion_info.IsAllHistory() ||
+      DeletionsDiffer(deletion_info.deleted_rows(), urls_to_be_deleted_))
     driver_->HistoryDeleted();
 }
 

components/history/core/browser/browsing_history_service.h

@@ -202,10 +202,7 @@ class BrowsingHistoryService : public HistoryServiceObserver,
 
   // HistoryServiceObserver implementation.
   void OnURLsDeleted(HistoryService* history_service,
-                     bool all_history,
-                     bool expired,
-                     const URLRows& deleted_rows,
-                     const std::set<GURL>& favicon_urls) override;
+                     const DeletionInfo& deletion_info) override;
 
   // WebHistoryServiceObserver implementation.
   void OnWebHistoryDeleted() override;

components/history/core/browser/history_backend_unittest.cc

@@ -226,10 +226,7 @@ class HistoryBackendTestBase : public testing::Test {
   }
 
   void NotifyURLsDeleted(DeletionInfo deletion_info) {
-    mem_backend_->OnURLsDeleted(nullptr, deletion_info.IsAllHistory(),
-                                deletion_info.is_from_expiration(),
-                                deletion_info.deleted_rows(),
-                                deletion_info.favicon_urls());
+    mem_backend_->OnURLsDeleted(nullptr, deletion_info);
     urls_deleted_notifications_.push_back(std::make_pair(
         deletion_info.IsAllHistory(), deletion_info.is_from_expiration()));
   }
@@ -3946,8 +3943,7 @@ TEST_F(InMemoryHistoryBackendTest, OnURLsDeletedEnMasse) {
   SimulateNotificationURLsModified(mem_backend_.get(), &row1, &row2, &row3);
 
   // Now notify the in-memory database that all history has been deleted.
-  mem_backend_->OnURLsDeleted(nullptr, true, false, URLRows(),
-                              std::set<GURL>());
+  mem_backend_->OnURLsDeleted(nullptr, history::DeletionInfo::ForAllHistory());
 
   // Expect that everything goes away.
   EXPECT_EQ(0, mem_backend_->db()->GetRowForURL(row1.url(), nullptr));

components/history/core/browser/in_memory_history_backend.cc

@@ -58,13 +58,10 @@ void InMemoryHistoryBackend::OnURLsModified(HistoryService* history_service,
 }
 
 void InMemoryHistoryBackend::OnURLsDeleted(HistoryService* history_service,
-                                           bool all_history,
-                                           bool expired,
-                                           const URLRows& deleted_rows,
-                                           const std::set<GURL>& favicon_urls) {
+                                           const DeletionInfo& deletion_info) {
   DCHECK(db_);
 
-  if (all_history) {
+  if (deletion_info.IsAllHistory()) {
     // When all history is deleted, the individual URLs won't be listed. Just
     // create a new database to quickly clear everything out.
     db_.reset(new InMemoryDatabase);
@@ -74,7 +71,7 @@ void InMemoryHistoryBackend::OnURLsDeleted(HistoryService* history_service,
   }
 
   // Delete all matching URLs in our database.
-  for (const auto& row : deleted_rows) {
+  for (const auto& row : deletion_info.deleted_rows()) {
     // This will also delete the corresponding keyword search term.
     // Ignore errors, as we typically only cache a subset of URLRows.
     db_->DeleteURLRow(row.id());

components/history/core/browser/in_memory_history_backend.h

@@ -78,10 +78,7 @@ class InMemoryHistoryBackend : public HistoryServiceObserver {
   void OnURLsModified(HistoryService* history_service,
                       const URLRows& changed_urls) override;
   void OnURLsDeleted(HistoryService* history_service,
-                     bool all_history,
-                     bool expired,
-                     const URLRows& deleted_rows,
-                     const std::set<GURL>& favicon_urls) override;
+                     const DeletionInfo& deletion_info) override;
   void OnKeywordSearchTermUpdated(HistoryService* history_service,
                                   const URLRow& row,
                                   KeywordID keyword_id,

components/history/core/browser/top_sites_impl.cc

@@ -890,19 +890,16 @@ void TopSitesImpl::OnTopSitesAvailableFromHistory(
 }
 
 void TopSitesImpl::OnURLsDeleted(HistoryService* history_service,
-                                 bool all_history,
-                                 bool expired,
-                                 const URLRows& deleted_rows,
-                                 const std::set<GURL>& favicon_urls) {
+                                 const DeletionInfo& deletion_info) {
   if (!loaded_)
     return;
 
-  if (all_history) {
+  if (deletion_info.IsAllHistory()) {
     SetTopSites(MostVisitedURLList(), CALL_LOCATION_FROM_OTHER_PLACES);
     backend_->ResetDatabase();
   } else {
     std::set<size_t> indices_to_delete;  // Indices into top_sites_.
-    for (const auto& row : deleted_rows) {
+    for (const auto& row : deletion_info.deleted_rows()) {
       if (cache_->IsKnownURL(row.url()))
         indices_to_delete.insert(cache_->GetURLIndex(row.url()));
     }

components/history/core/browser/top_sites_impl.h

@@ -268,10 +268,7 @@ class TopSitesImpl : public TopSites, public HistoryServiceObserver {
 
   // history::HistoryServiceObserver:
   void OnURLsDeleted(HistoryService* history_service,
-                     bool all_history,
-                     bool expired,
-                     const URLRows& deleted_rows,
-                     const std::set<GURL>& favicon_urls) override;
+                     const DeletionInfo& deletion_info) override;
 
   // Ensures that non thread-safe methods are called on the correct thread.
   base::ThreadChecker thread_checker_;