Add ExpireHistoryBackend::DeleteURLs method

chrome/browser/history/expire_history_backend.cc

 // Copyright (c) 2011 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 <limits>
 
 #include "base/bind.h"
@@ skipping 179 matching lines @@
                                         ArchivedDatabase* archived_db,
                                         ThumbnailDatabase* thumb_db,
                                         TextDatabaseManager* text_db) {
   main_db_ = main_db;
   archived_db_ = archived_db;
   thumb_db_ = thumb_db;
   text_db_ = text_db;
 }
 
 void ExpireHistoryBackend::DeleteURL(const GURL& url) {
   if (!main_db_)

[sky, 2011/12/14 23:16:49]

Implement this in terms of DeleteURLs.

[akalin, 2011/12/14 23:43:08]

Done.

     return;
 
-  URLRow url_row;
-  if (!main_db_->GetRowForURL(url, &url_row))
-    return;  // Nothing to delete.
-
-  // Collect all the visits and delete them. Note that we don't give up if
-  // there are no visits, since the URL could still have an entry that we should
-  // delete.
-  // TODO(brettw): bug 1171148: We should also delete from the archived DB.
-  VisitVector visits;
-  main_db_->GetVisitsForURL(url_row.id(), &visits);
-
   DeleteDependencies dependencies;
-  DeleteVisitRelatedInfo(visits, &dependencies);
-
-  // We skip ExpireURLsForVisits (since we are deleting from the URL, and not
-  // starting with visits in a given time range). We therefore need to call the
-  // deletion and favicon update functions manually.
-
-  BookmarkService* bookmark_service = GetBookmarkService();
-  bool is_bookmarked =
-      (bookmark_service && bookmark_service->IsBookmarked(url));
-
-  DeleteOneURL(url_row, is_bookmarked, &dependencies);
-  if (!is_bookmarked)
-    DeleteFaviconsIfPossible(dependencies.affected_favicons);
-
-  if (text_db_)
-    text_db_->OptimizeChangedDatabases(dependencies.text_db_changes);
+  DeleteURLHelper(url, &dependencies);
 
   BroadcastDeleteNotifications(&dependencies);
 }
+
+void ExpireHistoryBackend::DeleteURLs(const std::vector<GURL>& urls) {
+  if (!main_db_)
+    return;
+
+  DeleteDependencies dependencies;
+  for (std::vector<GURL>::const_iterator url = urls.begin(); url != urls.end();
+       ++url) {
+    DeleteURLHelper(*url, &dependencies);
+  }
+
+  BroadcastDeleteNotifications(&dependencies);
+}
 
 void ExpireHistoryBackend::ExpireHistoryBetween(
     const std::set<GURL>& restrict_urls, Time begin_time, Time end_time) {
   if (!main_db_)
     return;
 
   // There may be stuff in the text database manager's temporary cache.
   if (text_db_)
     text_db_->DeleteFromUncommitted(restrict_urls, begin_time, end_time);
 
@@ skipping 107 matching lines @@
     // determine if they care whether anything was deleted).
     URLsDeletedDetails* deleted_details = new URLsDeletedDetails;
     deleted_details->all_history = false;
     for (size_t i = 0; i < dependencies->deleted_urls.size(); i++)
       deleted_details->urls.insert(dependencies->deleted_urls[i].url());
     delegate_->BroadcastNotifications(
         chrome::NOTIFICATION_HISTORY_URLS_DELETED, deleted_details);
   }
 }
 
+void ExpireHistoryBackend::DeleteURLHelper(
+    const GURL& url, DeleteDependencies* dependencies) {
+  URLRow url_row;
+  if (!main_db_->GetRowForURL(url, &url_row))
+    return;  // Nothing to delete.
+
+  // Collect all the visits and delete them. Note that we don't give up if
+  // there are no visits, since the URL could still have an entry that we should
+  // delete.
+  // TODO(brettw): bug 1171148: We should also delete from the archived DB.
+  VisitVector visits;
+  main_db_->GetVisitsForURL(url_row.id(), &visits);
+
+  DeleteVisitRelatedInfo(visits, dependencies);
+
+  // We skip ExpireURLsForVisits (since we are deleting from the URL, and not
+  // starting with visits in a given time range). We therefore need to call the
+  // deletion and favicon update functions manually.
+
+  BookmarkService* bookmark_service = GetBookmarkService();
+  bool is_bookmarked =
+      (bookmark_service && bookmark_service->IsBookmarked(url));
+
+  DeleteOneURL(url_row, is_bookmarked, dependencies);
+  if (!is_bookmarked)
+    DeleteFaviconsIfPossible(dependencies->affected_favicons);
+
+  if (text_db_)
+    text_db_->OptimizeChangedDatabases(dependencies->text_db_changes);
+}
+
 void ExpireHistoryBackend::DeleteVisitRelatedInfo(
     const VisitVector& visits,
     DeleteDependencies* dependencies) {
   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.
     std::map<URLID, URLRow>::const_iterator found =
         dependencies->affected_urls.find(visits[i].url_id);
@@ skipping 336 matching lines @@
   // We use the bookmark service to determine if a URL is bookmarked. The
   // bookmark service is loaded on a separate thread and may not be done by the
   // time we get here. We therefor block until the bookmarks have finished
   // loading.
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history