Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/expire_history_backend_unittest.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 <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 359 matching lines @@
   main_db_->GetVisitsForURL(row.id(), &visits);
   EXPECT_EQ(0U, visits.size());
 
   // Thumbnail should be gone.
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_FALSE(HasThumbnail(row.id()));
 
   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 {
       EXPECT_NE(notifications_[i].first,
                 chrome::NOTIFICATION_HISTORY_URL_VISITED);
       EXPECT_NE(notifications_[i].first,
                 chrome::NOTIFICATION_HISTORY_URLS_MODIFIED);
     }
   }
   EXPECT_TRUE(found_delete_notification);
@@ skipping 554 matching lines @@
   main_db_->GetVisitsForURL(url_id, &archived_visits);
   EXPECT_EQ(0U, archived_visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history