Single URL Expires Were Not Being Deleted.

chrome/browser/autocomplete/network_action_predictor_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 "chrome/browser/autocomplete/network_action_predictor.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 152 matching lines @@
         db_cache()->find(key);
     ASSERT_TRUE(it != db_cache()->end());
 
     predictor_->UpdateRow(it, row);
   }
 
   void DeleteAllRows() {
     predictor_->DeleteAllRows();
   }
 
-  void DeleteRowsWithURLs(const std::set<GURL>& urls) {
-    predictor_->DeleteRowsWithURLs(urls);
+  void DeleteRowsWithURLs(const history::URLRows& rows) {
+    predictor_->DeleteRowsWithURLs(rows);
   }
 
   void DeleteOldIdsFromCaches(
       std::vector<NetworkActionPredictorDatabase::Row::Id>* id_list) {
     HistoryService* history_service =
         profile_.GetHistoryService(Profile::EXPLICIT_ACCESS);
     ASSERT_TRUE(history_service);
 
     history::URLDatabase* url_db = history_service->InMemoryDatabase();
     ASSERT_TRUE(url_db);
@@ skipping 86 matching lines @@
   EXPECT_TRUE(db_cache()->empty());
   EXPECT_TRUE(db_id_cache()->empty());
 }
 
 TEST_F(NetworkActionPredictorTest, DeleteRowsWithURLs) {
   ASSERT_NO_FATAL_FAILURE(AddAllRows());
 
   EXPECT_EQ(arraysize(test_url_db), db_cache()->size());
   EXPECT_EQ(arraysize(test_url_db), db_id_cache()->size());
 
-  std::set<GURL> urls;
+  history::URLRows rows;
   for (size_t i = 0; i < 2; ++i)
-    urls.insert(test_url_db[i].url);
+    rows.push_back(history::URLRow(test_url_db[i].url));
 
-  DeleteRowsWithURLs(urls);
+  DeleteRowsWithURLs(rows);
 
   EXPECT_EQ(arraysize(test_url_db) - 2, db_cache()->size());
   EXPECT_EQ(arraysize(test_url_db) - 2, db_id_cache()->size());
 
   for (size_t i = 0; i < arraysize(test_url_db); ++i) {
     DBCacheKey key = { test_url_db[i].user_text, test_url_db[i].url };
 
     bool deleted = (i < 2);
     EXPECT_EQ(deleted, db_cache()->find(key) == db_cache()->end());
     EXPECT_EQ(deleted, db_id_cache()->find(key) == db_id_cache()->end());
@@ skipping 59 matching lines @@
     NetworkActionPredictor::Action expected_action =
         (test_url_db[i].expected_action ==
          NetworkActionPredictor::ACTION_PRERENDER) ?
         NetworkActionPredictor::ACTION_PRECONNECT :
         test_url_db[i].expected_action;
     EXPECT_EQ(expected_action,
               predictor()->RecommendAction(test_url_db[i].user_text, match))
         << "Unexpected action for " << match.destination_url;
   }
 }