Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/autocomplete/network_action_predictor_unittest.cc

Index: chrome/browser/autocomplete/network_action_predictor_unittest.cc
===================================================================
--- chrome/browser/autocomplete/network_action_predictor_unittest.cc	(revision 132294)
+++ chrome/browser/autocomplete/network_action_predictor_unittest.cc	(working copy)
@@ -170,8 +170,8 @@
     predictor_->DeleteAllRows();
   }
 
-  void DeleteRowsWithURLs(const history::URLRows& rows) {
-    predictor_->DeleteRowsWithURLs(rows);
+  void DeleteRowsWithURLs(const std::set<GURL>& urls) {
+    predictor_->DeleteRowsWithURLs(urls);
   }
 
   void DeleteOldIdsFromCaches(
@@ -278,11 +278,11 @@
   EXPECT_EQ(arraysize(test_url_db), db_cache()->size());
   EXPECT_EQ(arraysize(test_url_db), db_id_cache()->size());
 
-  history::URLRows rows;
+  std::set<GURL> urls;
   for (size_t i = 0; i < 2; ++i)
-    rows.push_back(history::URLRow(test_url_db[i].url));
+    urls.insert(test_url_db[i].url);
 
-  DeleteRowsWithURLs(rows);
+  DeleteRowsWithURLs(urls);
 
   EXPECT_EQ(arraysize(test_url_db) - 2, db_cache()->size());
   EXPECT_EQ(arraysize(test_url_db) - 2, db_id_cache()->size());