Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/shortcuts_backend.cc

Index: chrome/browser/history/shortcuts_backend.cc
===================================================================
--- chrome/browser/history/shortcuts_backend.cc	(revision 132295)
+++ chrome/browser/history/shortcuts_backend.cc	(working copy)
@@ -227,15 +227,13 @@
             all_history) {
       DeleteAllShortcuts();
     }
-    const URLRows& rows(
-        content::Details<const history::URLsDeletedDetails>(details)->rows);
+    const std::set<GURL>& urls =
+        content::Details<const history::URLsDeletedDetails>(details)->urls;
     std::vector<std::string> shortcut_ids;
 
     for (GuidToShortcutsIteratorMap::iterator it = guid_map_.begin();
          it != guid_map_.end(); ++it) {
-      if (std::find_if(rows.begin(), rows.end(),
-                       URLRow::URLRowHasURL(it->second->second.url)) !=
-          rows.end())
+      if (urls.find(it->second->second.url) != urls.end())
         shortcut_ids.push_back(it->first);
     }
     DeleteShortcutsWithIds(shortcut_ids);
Property changes on: chrome/browser/history/shortcuts_backend.cc
___________________________________________________________________
Added: svn:mergeinfo