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>
@@ skipping 2514 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;
-
+  const URLsDeletedDetails details(all_history, expired, rows, favicon_urls);
   if (typed_url_syncable_service_.get()) {
-    typed_url_syncable_service_->OnUrlsDeleted(
-        all_history, expired, &details->rows);
+    typed_url_syncable_service_->OnUrlsDeleted(all_history, expired,
+                                               const_cast<URLRows*>(&rows));

[sdefresne, 2014/12/04 17:21:12]

Do *not* use const_cast, instead copy rows into a local variable and use it for
the whole function. Note that typed_url_syncable_service_->OnUrlsDeleted(...)
may change the URLRows, so you need to use that updated list when calling the
delegate / observers.

URLRows copied_rows(rows);
if (typed_url_syncable_service_.get()) {
  typed_url_syncable_service_->OnUrlsDeleted(all_history, expired,
&copied_rows);
}

FOR_EACH_OBSERVER(HistoryBackedObserver, observers_,
                  OnURLsDeleted(this, all_history, expired, copied_rows));

if (delegate_)
  delegate_->NotifyURLsDeleted(all_history, expired, copied_rows);

[nshaik, 2014/12/07 09:34:49]

Done.

   }
 
-  BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                         details.Pass());
+  FOR_EACH_OBSERVER(HistoryBackendObserver, observers_,
+                    OnURLsDeleted(this, details));
+
+  // TODO(sdefresne): turn HistoryBackend::Delegate from HistoryService into
+  // an HistoryBackendObserver and register it so that we can remove this
+  // method.
+  if (delegate_)
+    delegate_->NotifyURLsDeleted(details);
 }
 
 // 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