Add ExpireHistoryBackend::DeleteURLs method

chrome/browser/history/expire_history_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
 #pragma once
 
 #include <queue>
 #include <set>
@@ skipping 65 matching lines @@
                     ThumbnailDatabase* thumb_db,
                     TextDatabaseManager* text_db);
 
   // Begins periodic expiration of history older than the given threshold. This
   // will continue until the object is deleted.
   void StartArchivingOldStuff(base::TimeDelta expiration_threshold);
 
   // Deletes everything associated with a URL.
   void DeleteURL(const GURL& url);
 
+  // Deletes everything associated with each URL in the list.
+  void DeleteURLs(const std::vector<GURL>& url);
+
   // Removes all visits to restrict_urls (or all URLs if empty) in the given
   // time range, updating the URLs accordingly,
   void ExpireHistoryBetween(const std::set<GURL>& restrict_urls,
                             base::Time begin_time, base::Time end_time);
 
   // Removes the given list of visits, updating the URLs accordingly (similar to
   // ExpireHistoryBetween(), but affecting a specific set of visits).
   void ExpireVisits(const VisitVector& visits);
 
   // Archives all visits before and including the given time, updating the URLs
   // accordingly. This function is intended for migrating old databases
   // (which encompased all time) to the tiered structure and testing, and
   // probably isn't useful for anything else.
   void ArchiveHistoryBefore(base::Time end_time);
 
   // Returns the current time that we are archiving stuff to. This will return
   // the threshold in absolute time rather than a delta, so the caller should
   // not save it.
   base::Time GetCurrentArchiveTime() const {
     return base::Time::Now() - expiration_threshold_;
   }
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ExpireHistoryTest, DeleteTextIndexForURL);
   FRIEND_TEST_ALL_PREFIXES(ExpireHistoryTest, DeleteFaviconsIfPossible);
   FRIEND_TEST_ALL_PREFIXES(ExpireHistoryTest, ArchiveSomeOldHistory);
   FRIEND_TEST_ALL_PREFIXES(ExpireHistoryTest, ExpiringVisitsReader);
   FRIEND_TEST_ALL_PREFIXES(ExpireHistoryTest, ArchiveSomeOldHistoryWithSource);
   friend class ::TestingProfile;
 
   struct DeleteDependencies;
 
-  // Removes the data from the full text index associated with the given URL
-  // string/ID pair. If |update_visits| is set, the visits that reference the
-  // indexed data will be updated to reflect the fact that the indexed data is
-  // gone. Setting this to false is a performance optimization when the caller
-  // knows that the visits will be deleted after the call.
-  //
-  // TODO(brettw) when we have an "archived" history database, this should take
-  // a flag to optionally delete from there. This way it can be used for page
-  // re-indexing as well as for full URL deletion.
-  void DeleteTextIndexForURL(const GURL& url, URLID url_id, bool update_visits);
+  // Used by DeleteURL and DeleteURLs.
+  void DeleteURLHelper(const GURL& url, DeleteDependencies* dependencies);
 
   // Deletes the visit-related stuff for all the visits in the given list, and
   // adds the rows for unique URLs affected to the affected_urls list in
   // the dependencies structure.
   //
   // Deleted information is the visits themselves and the full-text index
   // entries corresponding to them.
   void DeleteVisitRelatedInfo(const VisitVector& visits,
                               DeleteDependencies* dependencies);
 
@@ skipping 149 matching lines @@
   // Use GetBookmarkService to access this, which makes sure the service is
   // loaded.
   BookmarkService* bookmark_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExpireHistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_