Cleanup HistoryBackend and ExpireHistoryBackend interface

chrome/browser/history/expire_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/expire_history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"

[droger, 2014/10/29 17:55:11]

Is this still needed?

[sdefresne, 2014/10/30 10:54:30]

No, removed.

 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_notifications.h"

[droger, 2014/10/29 17:55:11]

Is this still needed?

[sdefresne, 2014/10/30 10:54:30]

No, removed.

 #include "chrome/browser/history/thumbnail_database.h"
 #include "components/history/core/browser/history_client.h"
 
 namespace history {
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 // The number of days by which the expiration threshold is advanced for items
@@ skipping 90 matching lines @@
 ExpireHistoryBackend::DeleteEffects::DeleteEffects() {
 }
 
 ExpireHistoryBackend::DeleteEffects::~DeleteEffects() {
 }
 
 
 // ExpireHistoryBackend -------------------------------------------------------
 
 ExpireHistoryBackend::ExpireHistoryBackend(
-    BroadcastNotificationDelegate* delegate,
+    ExpireHistoryBackendDelegate* delegate,
     HistoryClient* history_client)
     : delegate_(delegate),
       main_db_(NULL),
       thumb_db_(NULL),
       history_client_(history_client),
       weak_factory_(this) {
 }
 
 ExpireHistoryBackend::~ExpireHistoryBackend() {
 }
@@ skipping 169 matching lines @@
           thumb_db_->DeleteFavicon(*i)) {
         effects->deleted_favicons.insert(icon_url);
       }
     }
   }
 }
 
 void ExpireHistoryBackend::BroadcastNotifications(DeleteEffects* effects,
                                                   DeletionType type) {
   if (!effects->modified_urls.empty()) {
-    scoped_ptr<URLsModifiedDetails> details(new URLsModifiedDetails);
-    details->changed_urls = effects->modified_urls;
-    delegate_->NotifySyncURLsModified(&details->changed_urls);
-    delegate_->BroadcastNotifications(
-        chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, details.Pass());
+    delegate_->NotifyURLsModified(effects->modified_urls);
   }
   if (!effects->deleted_urls.empty()) {
-    scoped_ptr<URLsDeletedDetails> details(new URLsDeletedDetails);
-    details->all_history = false;
-    details->expired = (type == DELETION_EXPIRED);
-    details->rows = effects->deleted_urls;
-    details->favicon_urls = effects->deleted_favicons;
-    delegate_->NotifySyncURLsDeleted(details->all_history, details->expired,
-                                     &details->rows);
-    delegate_->BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                                      details.Pass());
+    delegate_->NotifyURLsDeleted(false,
+                                 type == DELETION_EXPIRED,
+                                 effects->deleted_urls,
+                                 effects->deleted_favicons);
   }
 }
 
 void ExpireHistoryBackend::DeleteVisitRelatedInfo(const VisitVector& visits,
                                                   DeleteEffects* effects) {
   for (size_t i = 0; i < visits.size(); i++) {
     // Delete the visit itself.
     main_db_->DeleteVisit(visits[i]);
 
     // Add the URL row to the affected URL list.
@@ skipping 169 matching lines @@
 HistoryClient* ExpireHistoryBackend::GetHistoryClient() {
   // We use the history client to determine if a URL is bookmarked. The data is
   // loaded on a separate thread and may not be done by the time we get here.
   // We therefore block until the bookmarks have finished loading.
   if (history_client_)
     history_client_->BlockUntilBookmarksLoaded();
   return history_client_;
 }
 
 }  // namespace history