Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/visitedlink/visitedlink_master.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/visitedlink/visitedlink_master.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <io.h>
 #include <shlobj.h>
@@ skipping 271 matching lines @@
   memset(hash_table_, 0, this->table_length_ * sizeof(Fingerprint));
 
   // Resize it if it is now too empty. Resize may write the new table out for
   // us, otherwise, schedule writing the new table to disk ourselves.
   if (!ResizeTableIfNecessary())
     WriteFullTable();
 
   listener_->Reset();
 }
 
-void VisitedLinkMaster::DeleteURLs(const history::URLRows& rows) {
+void VisitedLinkMaster::DeleteURLs(const std::set<GURL>& urls) {
   typedef std::set<GURL>::const_iterator SetIterator;
 
-  if (rows.empty())
+  if (urls.empty())
     return;
 
   listener_->Reset();
 
   if (table_builder_) {
     // A rebuild is in progress, save this deletion in the temporary list so
     // it can be added once rebuild is complete.
-    for (history::URLRows::const_iterator i = rows.begin(); i != rows.end();
-         ++i) {
-      const GURL& url(i->url());
-      if (!url.is_valid())
+    for (SetIterator i = urls.begin(); i != urls.end(); ++i) {
+      if (!i->is_valid())
         continue;
 
       Fingerprint fingerprint =
-          ComputeURLFingerprint(url.spec().data(), url.spec().size(), salt_);
+          ComputeURLFingerprint(i->spec().data(), i->spec().size(), salt_);
       deleted_since_rebuild_.insert(fingerprint);
 
       // If the URL was just added and now we're deleting it, it may be in the
       // list of things added since the last rebuild. Delete it from that list.
       std::set<Fingerprint>::iterator found =
           added_since_rebuild_.find(fingerprint);
       if (found != added_since_rebuild_.end())
         added_since_rebuild_.erase(found);
 
       // Delete the URLs from the in-memory table, but don't bother writing
       // to disk since it will be replaced soon.
       DeleteFingerprint(fingerprint, false);
     }
     return;
   }
 
   // Compute the deleted URLs' fingerprints and delete them
   std::set<Fingerprint> deleted_fingerprints;
-  for (history::URLRows::const_iterator i = rows.begin(); i != rows.end();
-       ++i) {
-    const GURL& url(i->url());
-    if (!url.is_valid())
+  for (SetIterator i = urls.begin(); i != urls.end(); ++i) {
+    if (!i->is_valid())
       continue;
     deleted_fingerprints.insert(
-        ComputeURLFingerprint(url.spec().data(), url.spec().size(), salt_));
+        ComputeURLFingerprint(i->spec().data(), i->spec().size(), salt_));
   }
   DeleteFingerprintsFromCurrentTable(deleted_fingerprints);
 }
 
 // See VisitedLinkCommon::IsVisited which should be in sync with this algorithm
 VisitedLinkMaster::Hash VisitedLinkMaster::AddFingerprint(
     Fingerprint fingerprint,
     bool send_notifications) {
   if (!hash_table_ || table_length_ == 0) {
     NOTREACHED();  // Not initialized.
@@ skipping 602 matching lines @@
 }
 
 void VisitedLinkMaster::TableBuilder::OnCompleteMainThread() {
   if (master_)
     master_->OnTableRebuildComplete(success_, fingerprints_);
 
   // WILL (generally) DELETE THIS! This balances the AddRef in
   // VisitedLinkMaster::RebuildTableFromHistory.
   Release();
 }