Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/expire_history_backend_unittest.cc

Index: chrome/browser/history/expire_history_backend_unittest.cc
===================================================================
--- chrome/browser/history/expire_history_backend_unittest.cc	(revision 132295)
+++ chrome/browser/history/expire_history_backend_unittest.cc	(working copy)
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <algorithm>
 #include <string>
 #include <utility>
 
@@ -382,10 +381,10 @@
   bool found_delete_notification = false;
   for (size_t i = 0; i < notifications_.size(); i++) {
     if (notifications_[i].first == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
-      const history::URLRows& rows(reinterpret_cast<URLsDeletedDetails*>(
-          notifications_[i].second)->rows);
-      if (std::find_if(rows.begin(), rows.end(),
-          history::URLRow::URLRowHasURL(row.url())) != rows.end()) {
+      const URLsDeletedDetails* deleted_details =
+          reinterpret_cast<URLsDeletedDetails*>(notifications_[i].second);
+      if (deleted_details->urls.find(row.url()) !=
+          deleted_details->urls.end()) {
         found_delete_notification = true;
       }
     } else {
Property changes on: chrome/browser/history/expire_history_backend_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo