Migrate HistoryServiceObserver for Android and Mac

Change HistoryServiceObservers to use the new OnUrlsDeleted method.

Bug: 839798
Change-Id: I2aa458985077cb076c186a966a22843b3e41c61e
Reviewed-on: https://chromium-review.googlesource.com/1064410Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Sidney San Martín <sdy@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560521}

chrome/browser/android/history_report/data_observer.cc

@@ -124,15 +124,12 @@ void DataObserver::OnURLsModified(history::HistoryService* history_service,
 }
 
 void DataObserver::OnURLsDeleted(history::HistoryService* history_service,
-                                 bool all_history,
-                                 bool expired,
-                                 const history::URLRows& deleted_rows,
-                                 const std::set<GURL>& favicon_urls) {
-  if (all_history) {
+                                 const history::DeletionInfo& deletion_info) {
+  if (deletion_info.IsAllHistory()) {
     delta_file_service_->Clear();
     data_cleared_callback_.Run();
   } else {
-    for (const auto& row : deleted_rows) {
+    for (const auto& row : deletion_info.deleted_rows()) {
       if (!row.hidden())
         delta_file_service_->PageDeleted(row.url());
     }

chrome/browser/android/history_report/data_observer.h

@@ -75,10 +75,7 @@ class DataObserver : public bookmarks::BookmarkModelObserver,
   void OnURLsModified(history::HistoryService* history_service,
                       const history::URLRows& changed_urls) override;
   void OnURLsDeleted(history::HistoryService* history_service,
-                     bool all_history,
-                     bool expired,
-                     const history::URLRows& deleted_rows,
-                     const std::set<GURL>& favicon_urls) override;
+                     const history::DeletionInfo& deletion_info) override;
 
  private:
   void DeleteBookmarks(const std::set<GURL>& removed_urls);

chrome/browser/android/provider/chrome_browser_provider.cc

@@ -1209,10 +1209,7 @@ void ChromeBrowserProvider::OnURLVisited(
 
 void ChromeBrowserProvider::OnURLsDeleted(
     history::HistoryService* history_service,
-    bool all_history,
-    bool expired,
-    const history::URLRows& deleted_rows,
-    const std::set<GURL>& favicon_urls) {
+    const history::DeletionInfo& deletion_info) {
   OnHistoryChanged();
 }
 

chrome/browser/android/provider/chrome_browser_provider.h

@@ -202,10 +202,7 @@ class ChromeBrowserProvider : public bookmarks::BaseBookmarkModelObserver,
                     const history::RedirectList& redirects,
                     base::Time visit_time) override;
   void OnURLsDeleted(history::HistoryService* history_service,
-                     bool all_history,
-                     bool expired,
-                     const history::URLRows& deleted_rows,
-                     const std::set<GURL>& favicon_urls) override;
+                     const history::DeletionInfo& deletion_info) override;
   void OnKeywordSearchTermUpdated(history::HistoryService* history_service,
                                   const history::URLRow& row,
                                   history::KeywordID keyword_id,

chrome/browser/ui/cocoa/history_menu_bridge.h

@@ -214,10 +214,7 @@ class HistoryMenuBridge : public sessions::TabRestoreServiceObserver,
   void OnURLsModified(history::HistoryService* history_service,
                       const history::URLRows& changed_urls) override;
   void OnURLsDeleted(history::HistoryService* history_service,
-                     bool all_history,
-                     bool expired,
-                     const history::URLRows& deleted_rows,
-                     const std::set<GURL>& favicon_urls) override;
+                     const history::DeletionInfo& deletion_info) override;
   void OnHistoryServiceLoaded(history::HistoryService* service) override;
 
   base::scoped_nsobject<HistoryMenuCocoaController> controller_;  // strong

chrome/browser/ui/cocoa/history_menu_bridge.mm

@@ -454,11 +454,9 @@ void HistoryMenuBridge::OnURLsModified(history::HistoryService* history_service,
   OnHistoryChanged();
 }
 
-void HistoryMenuBridge::OnURLsDeleted(history::HistoryService* history_service,
-                                      bool all_history,
-                                      bool expired,
-                                      const history::URLRows& deleted_rows,
-                                      const std::set<GURL>& favicon_urls) {
+void HistoryMenuBridge::OnURLsDeleted(
+    history::HistoryService* history_service,
+    const history::DeletionInfo& deletion_info) {
   OnHistoryChanged();
 }