Single URL Expires Were Not Being Deleted.

chrome/browser/history/top_sites.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/top_sites.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 664 matching lines @@
   if (!loaded_)
     return;
 
   if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
     content::Details<history::URLsDeletedDetails> deleted_details(details);
     if (deleted_details->all_history) {
       SetTopSites(MostVisitedURLList());
       backend_->ResetDatabase();
     } else {
       std::set<size_t> indices_to_delete;  // Indices into top_sites_.
-      for (std::set<GURL>::iterator i = deleted_details->urls.begin();
-           i != deleted_details->urls.end(); ++i) {
-        if (cache_->IsKnownURL(*i))
-          indices_to_delete.insert(cache_->GetURLIndex(*i));
+      for (URLRows::const_iterator i = deleted_details->rows.begin();
+           i != deleted_details->rows.end(); ++i) {
+        if (cache_->IsKnownURL(i->url()))
+          indices_to_delete.insert(cache_->GetURLIndex(i->url()));
       }
 
       if (indices_to_delete.empty())
         return;
 
       MostVisitedURLList new_top_sites(cache_->top_sites());
       for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
            i != indices_to_delete.rend(); i++) {
         new_top_sites.erase(new_top_sites.begin() + *i);
       }
@@ skipping 194 matching lines @@
   SetTopSites(pages);
 
   // Used only in testing.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_UPDATED,
       content::Source<TopSites>(this),
       content::Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history