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) {
+  DeleteURLs(std::vector<GURL>(1, url));
+}
+
+void ExpireHistoryBackend::DeleteURLs(const std::vector<GURL>& urls) {
   if (!main_db_)
     return;
 
-  URLRow url_row;
-  if (!main_db_->GetRowForURL(url, &url_row))
-    return;  // Nothing to delete.
+  DeleteDependencies dependencies;
+  for (std::vector<GURL>::const_iterator url = urls.begin(); url != urls.end();
+       ++url) {
+    URLRow url_row;
+    if (!main_db_->GetRowForURL(*url, &url_row))
+      return;  // Nothing to delete.

[sky, 2011/12/16 22:00:11]

This should be continue now.

 
-  // 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);
+    // 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);
+    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.
+    // 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));
+    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);
+    DeleteOneURL(url_row, is_bookmarked, &dependencies);
+    if (!is_bookmarked)
+      DeleteFaviconsIfPossible(dependencies.affected_favicons);

[sky, 2011/12/16 22:00:11]

This is wrong now. In particular if the previous url was bookmarked, this still
ends up deleting favicons.

 
-  if (text_db_)
-    text_db_->OptimizeChangedDatabases(dependencies.text_db_changes);
+    if (text_db_)

[sky, 2011/12/16 22:00:11]

This should be outside the loop.

+      text_db_->OptimizeChangedDatabases(dependencies.text_db_changes);
+  }
 
   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.
@@ skipping 466 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