Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/history/history_backend.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 "chrome/browser/history/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/url_constants.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "components/history/core/browser/download_constants.h"
@@ skipping 2444 matching lines @@
     scoped_ptr<HistoryDBTask> task,
     scoped_refptr<base::SingleThreadTaskRunner> origin_loop,
     const base::CancelableTaskTracker::IsCanceledCallback& is_canceled) {
   bool scheduled = !queued_history_db_tasks_.empty();
   queued_history_db_tasks_.push_back(
       new QueuedHistoryDBTask(task.Pass(), origin_loop, is_canceled));
   if (!scheduled)
     ProcessDBTaskImpl();
 }
 
-void HistoryBackend::BroadcastNotifications(
-    int type,
-    scoped_ptr<HistoryDetails> details) {
-  // |delegate_| may be NULL if |this| is in the process of closing (closed by
-  // HistoryService -> HistoryBackend::Closing().
-  if (delegate_)
-    delegate_->BroadcastNotifications(type, details.Pass());
-}
-
 void HistoryBackend::NotifyFaviconChanged(const std::set<GURL>& urls) {
   if (delegate_)
     delegate_->NotifyFaviconChanged(urls);
 }
 
 void HistoryBackend::NotifyURLVisited(ui::PageTransition transition,
                                       const URLRow& row,
                                       const RedirectList& redirects,
                                       base::Time visit_time) {
   URLRow url_info(row);
@@ skipping 24 matching lines @@
   // an HistoryBackendObserver and register it so that we can remove this
   // method.
   if (delegate_)
     delegate_->NotifyURLsModified(changed_urls);
 }
 
 void HistoryBackend::NotifyURLsDeleted(bool all_history,
                                        bool expired,
                                        const URLRows& rows,
                                        const std::set<GURL>& favicon_urls) {
-  scoped_ptr<URLsDeletedDetails> details(new URLsDeletedDetails);
-  details->all_history = all_history;
-  details->expired = expired;
-  details->rows = rows;
-  details->favicon_urls = favicon_urls;
-
+  URLRows copied_rows(rows);
   if (typed_url_syncable_service_.get()) {
-    typed_url_syncable_service_->OnUrlsDeleted(
-        all_history, expired, &details->rows);
+    typed_url_syncable_service_->OnUrlsDeleted(all_history, expired,
+                                               &copied_rows);
   }
 
-  BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                         details.Pass());
+  FOR_EACH_OBSERVER(
+      HistoryBackendObserver, observers_,
+      OnURLsDeleted(this, all_history, expired, copied_rows, favicon_urls));
+
+  // TODO(sdefresne): turn HistoryBackend::Delegate from HistoryService into
+  // an HistoryBackendObserver and register it so that we can remove this
+  // method.
+  if (delegate_)
+    delegate_->NotifyURLsDeleted(all_history, expired, copied_rows,
+                                 favicon_urls);
 }
 
 // Deleting --------------------------------------------------------------------
 
 void HistoryBackend::DeleteAllHistory() {
   // Our approach to deleting all history is:
   //  1. Copy the bookmarks and their dependencies to new tables with temporary
   //     names.
   //  2. Delete the original tables. Since tables can not share pages, we know
   //     that any data we don't want to keep is now in an unused page.
@@ skipping 133 matching lines @@
   info.url_id = visit.url_id;
   info.time = visit.visit_time;
   info.transition = visit.transition;
   // If we don't have a delegate yet during setup or shutdown, we will drop
   // these notifications.
   if (delegate_)
     delegate_->NotifyAddVisit(info);
 }
 
 }  // namespace history