Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/visitedlink/visitedlink_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 <cstdio>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 245 matching lines @@
   ASSERT_TRUE(InitHistory());
   ASSERT_TRUE(InitVisited(16381, true));
 
   // Add the base set of URLs that won't be deleted.
   // Reload() will test for these.
   for (int32 i = 0; i < g_test_count; i++)
     master_->AddURL(TestURL(i));
 
   // Add more URLs than necessary to trigger this case.
   const int kTestDeleteCount = VisitedLinkMaster::kBigDeleteThreshold + 2;
-  history::URLRows urls_to_delete;
+  std::set<GURL> urls_to_delete;
   for (int32 i = g_test_count; i < g_test_count + kTestDeleteCount; i++) {
     GURL url(TestURL(i));
     master_->AddURL(url);
-    urls_to_delete.push_back(history::URLRow(url));
+    urls_to_delete.insert(url);
   }
 
   master_->DeleteURLs(urls_to_delete);
   master_->DebugValidate();
 
   Reload();
 }
 
 TEST_F(VisitedLinkTest, DeleteAll) {
   ASSERT_TRUE(InitHistory());
@@ skipping 111 matching lines @@
   // can't be 100% sure we're testing the right thing, but in practice is.
   // All the adds above will generally take some time queuing up on the
   // history thread, and it will take a while to catch up to actually
   // processing the rebuild that has queued behind it. We will generally
   // finish adding all of the URLs before it has even found the first URL.
   for (int i = history_count; i < g_test_count; i++)
     master_->AddURL(TestURL(i));
 
   // Add one more and then delete it.
   master_->AddURL(TestURL(g_test_count));
-  history::URLRows deleted_urls;
-  deleted_urls.push_back(history::URLRow(TestURL(g_test_count)));
+  std::set<GURL> deleted_urls;
+  deleted_urls.insert(TestURL(g_test_count));
   master_->DeleteURLs(deleted_urls);
 
   // Wait for the rebuild to complete. The task will terminate the message
   // loop when the rebuild is done. There's no chance that the rebuild will
   // complete before we set the task because the rebuild completion message
   // is posted to the message loop; until we Run() it, rebuild can not
   // complete.
   master_->set_rebuild_complete_task(MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
@@ skipping 26 matching lines @@
 TEST_F(VisitedLinkTest, Listener) {
   ASSERT_TRUE(InitHistory());
   ASSERT_TRUE(InitVisited(0, true));
 
   // Add test URLs.
   for (int i = 0; i < g_test_count; i++) {
     master_->AddURL(TestURL(i));
     ASSERT_EQ(i + 1, master_->GetUsedCount());
   }
 
-  history::URLRows deleted_urls;
-  deleted_urls.push_back(history::URLRow(TestURL(0)));
+  std::set<GURL> deleted_urls;
+  deleted_urls.insert(TestURL(0));
   // Delete an URL.
   master_->DeleteURLs(deleted_urls);
   // ... and all of the remaining ones.
   master_->DeleteAllURLs();
 
   // Verify that VisitedLinkMaster::Listener::Add was called for each added URL.
   EXPECT_EQ(g_test_count, listener_.add_count());
   // Verify that VisitedLinkMaster::Listener::Reset was called both when one and
   // all URLs are deleted.
   EXPECT_EQ(2, listener_.reset_count());
@@ skipping 250 matching lines @@
   EXPECT_EQ(1, profile()->add_event_count());
   EXPECT_EQ(0, profile()->reset_event_count());
 
   // Activate the tab.
   rvh_tester()->SimulateWasRestored();
 
   // We should have only one more reset event.
   EXPECT_EQ(1, profile()->add_event_count());
   EXPECT_EQ(1, profile()->reset_event_count());
 }