Migrate WTF::LinkedHashSet/ListHashSet/HashTable::remove() to ::erase()

third_party/WebKit/Source/wtf/ListHashSetTest.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 229 matching lines @@
   set.insertBefore(it, 1);
   if (!canModifyWhileIterating)
     it = set.find(2);
   ++it;
   EXPECT_EQ(3, *it);
   EXPECT_EQ(5u, set.size());
   --it;
   --it;
   EXPECT_EQ(1, *it);
   if (canModifyWhileIterating) {
-    set.remove(-1);
-    set.remove(0);
-    set.remove(2);
-    set.remove(3);
+    set.erase(-1);
+    set.erase(0);
+    set.erase(2);
+    set.erase(3);
     EXPECT_EQ(1u, set.size());
     EXPECT_EQ(1, *it);
     ++it;
     EXPECT_EQ(it, set.end());
     --it;
     EXPECT_EQ(1, *it);
     set.insertBefore(it, -1);
     set.insertBefore(it, 0);
     set.insert(2);
     set.insert(3);
@@ skipping 21 matching lines @@
   EXPECT_EQ(3, *it);
   --it;
   EXPECT_EQ(2, *it);
   EXPECT_EQ(5u, set.size());
   --it;
   EXPECT_EQ(1, *it);
   --it;
   EXPECT_EQ(0, *it);
   it = set.addReturnIterator(4);
   if (canModifyWhileIterating) {
-    set.remove(3);
-    set.remove(2);
-    set.remove(1);
-    set.remove(0);
-    set.remove(-1);
+    set.erase(3);
+    set.erase(2);
+    set.erase(1);
+    set.erase(0);
+    set.erase(-1);
     EXPECT_EQ(1u, set.size());
   }
   EXPECT_EQ(4, *it);
   ++it;
   EXPECT_EQ(it, set.end());
   --it;
   EXPECT_EQ(4, *it);
   if (canModifyWhileIterating) {
     set.insertBefore(it, -1);
     set.insertBefore(it, 0);
     set.insertBefore(it, 1);
     set.insertBefore(it, 2);
     set.insertBefore(it, 3);
   }
   EXPECT_EQ(6u, set.size());
   it = set.addReturnIterator(5);
   EXPECT_EQ(7u, set.size());
-  set.remove(it);
+  set.erase(it);
   EXPECT_EQ(6u, set.size());
   EXPECT_EQ(4, set.back());
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, Swap) {
   using Set = TypeParam;
   int num = 10;
   Set set0;
   Set set1;
   Set set2;
@@ skipping 20 matching lines @@
   it2 = set1.begin();
   for (int i = 0; i < num; ++i, ++it1, ++it2) {
     EXPECT_EQ(*it1, i + 1);
     EXPECT_EQ(*it2, num - i);
   }
   EXPECT_EQ(it1, set0.end());
   EXPECT_EQ(it2, set1.end());
   EXPECT_EQ(set2.begin(), set2.end());
 
   int removedIndex = num >> 1;
-  set0.remove(removedIndex + 1);
-  set1.remove(num - removedIndex);
+  set0.erase(removedIndex + 1);
+  set1.erase(num - removedIndex);
 
   it1 = set0.begin();
   it2 = set1.begin();
   for (int i = 0; i < num; ++i, ++it1, ++it2) {
     if (i == removedIndex)
       ++i;
     EXPECT_EQ(*it1, i + 1);
     EXPECT_EQ(*it2, num - i);
   }
   EXPECT_EQ(it1, set0.end());
@@ skipping 44 matching lines @@
   DummyRefCounted* rawPtr = ptr.get();
 
   EXPECT_TRUE(set.contains(ptr));
   EXPECT_TRUE(set.contains(rawPtr));
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
 
   ptr.clear();
   EXPECT_FALSE(isDeleted);
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
 
-  set.remove(rawPtr);
+  set.erase(rawPtr);
   EXPECT_TRUE(isDeleted);
 
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
 }
 
 TYPED_TEST(ListOrLinkedHashSetRefPtrTest, ExerciseValuePeekInType) {
   using Set = TypeParam;
   Set set;
   bool isDeleted = false;
   bool isDeleted2 = false;
 
   RefPtr<DummyRefCounted> ptr = adoptRef(new DummyRefCounted(isDeleted));
   RefPtr<DummyRefCounted> ptr2 = adoptRef(new DummyRefCounted(isDeleted2));
 
   typename Set::AddResult addResult = set.insert(ptr);
   EXPECT_TRUE(addResult.isNewEntry);
   set.find(ptr);
   const Set& constSet(set);
   constSet.find(ptr);
   EXPECT_TRUE(set.contains(ptr));
   typename Set::iterator it = set.addReturnIterator(ptr);
   set.appendOrMoveToLast(ptr);
   set.prependOrMoveToFirst(ptr);
   set.insertBefore(ptr, ptr);
   set.insertBefore(it, ptr);
   EXPECT_EQ(1u, set.size());
   set.insert(ptr2);
   ptr2.clear();
-  set.remove(ptr);
+  set.erase(ptr);
 
   EXPECT_FALSE(isDeleted);
   ptr.clear();
   EXPECT_TRUE(isDeleted);
 
   EXPECT_FALSE(isDeleted2);
   set.removeFirst();
   EXPECT_TRUE(isDeleted2);
 
   EXPECT_EQ(0u, set.size());
@@ skipping 102 matching lines @@
     OwnPtrSet::AddResult res2 = set.insert(WTF::wrapUnique(ptr2));
     EXPECT_EQ(res2.storedValue->get(), ptr2);
   }
 
   EXPECT_FALSE(deleted2);
   EXPECT_EQ(2UL, set.size());
   OwnPtrSet::iterator it2 = set.find(ptr2);
   EXPECT_NE(set.end(), it2);
   EXPECT_EQ(ptr2, (*it2).get());
 
-  set.remove(ptr1);
+  set.erase(ptr1);
   EXPECT_TRUE(deleted1);
 
   set.clear();
   EXPECT_TRUE(deleted2);
   EXPECT_TRUE(set.isEmpty());
 
   deleted1 = false;
   deleted2 = false;
   {
     OwnPtrSet set;
@@ skipping 219 matching lines @@
     iter = set.find(MoveOnly(5));
     ASSERT_TRUE(iter != set.end());
     AddResult addResult = set.insertBefore(iter, MoveOnly(6, 6));
     EXPECT_TRUE(addResult.isNewEntry);
     EXPECT_EQ(6, addResult.storedValue->value());
     EXPECT_EQ(6, addResult.storedValue->id());
   }
 
   // ... but they don't have any pass-out (like take()) methods.
 
-  set.remove(MoveOnly(3));
+  set.erase(MoveOnly(3));
   set.clear();
 }
 
 }  // anonymous namespace
 
 }  // namespace WTF