Migrate WTF::HashMap::remove() to ::erase()

third_party/WebKit/Source/wtf/HashMapTest.cpp

 /*
  * Copyright (C) 2011 Google 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 108 matching lines @@
     std::unique_ptr<DestructCounter>& ownCounter = iter->value;
     EXPECT_EQ(iter->key, ownCounter->get());
   }
   ASSERT_EQ(0, destructNumber);
 
   std::unique_ptr<DestructCounter> ownCounter1 = map.take(1);
   EXPECT_EQ(ownCounter1.get(), counter1);
   EXPECT_FALSE(map.contains(1));
   EXPECT_EQ(0, destructNumber);
 
-  map.remove(2);
+  map.erase(2);
   EXPECT_FALSE(map.contains(2));
   EXPECT_EQ(0UL, map.size());
   EXPECT_EQ(1, destructNumber);
 
   ownCounter1.reset();
   EXPECT_EQ(2, destructNumber);
 }
 
 class DummyRefCounted : public RefCounted<DummyRefCounted> {
  public:
@@ skipping 39 matching lines @@
 
   EXPECT_TRUE(map.contains(rawPtr));
   EXPECT_NE(map.end(), map.find(rawPtr));
   EXPECT_TRUE(map.contains(ptr));
   EXPECT_NE(map.end(), map.find(ptr));
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
 
   ptr.clear();
   EXPECT_FALSE(isDeleted);
 
-  map.remove(rawPtr);
+  map.erase(rawPtr);
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
   EXPECT_TRUE(isDeleted);
   EXPECT_TRUE(map.isEmpty());
 }
 
 TEST(HashMaptest, RemoveAdd) {
   DummyRefCounted::m_refInvokesCount = 0;
   bool isDeleted = false;
 
   typedef HashMap<int, RefPtr<DummyRefCounted>> Map;
   Map map;
 
   RefPtr<DummyRefCounted> ptr = adoptRef(new DummyRefCounted(isDeleted));
   EXPECT_EQ(0, DummyRefCounted::m_refInvokesCount);
 
   map.add(1, ptr);
   // Referenced only once (to store a copy in the container).
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
   EXPECT_EQ(ptr, map.get(1));
 
   ptr.clear();
   EXPECT_FALSE(isDeleted);
 
-  map.remove(1);
+  map.erase(1);
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
   EXPECT_TRUE(isDeleted);
   EXPECT_TRUE(map.isEmpty());
 
   // Add and remove until the deleted slot is reused.
   for (int i = 1; i < 100; i++) {
     bool isDeleted2 = false;
     RefPtr<DummyRefCounted> ptr2 = adoptRef(new DummyRefCounted(isDeleted2));
     map.add(i, ptr2);
     EXPECT_FALSE(isDeleted2);
     ptr2.clear();
     EXPECT_FALSE(isDeleted2);
-    map.remove(i);
+    map.erase(i);
     EXPECT_TRUE(isDeleted2);
   }
 }
 
 class SimpleClass {
  public:
   explicit SimpleClass(int v) : m_v(v) {}
   int v() { return m_v; }
 
  private:
@@ skipping 155 matching lines @@
   EXPECT_EQ(7, iter->key);
   EXPECT_EQ(70, iter->value.value());
 
   {
     TheMap::AddResult addResult = map.set(9, MoveOnly(999));
     EXPECT_FALSE(addResult.isNewEntry);
     EXPECT_EQ(9, addResult.storedValue->key);
     EXPECT_EQ(999, addResult.storedValue->value.value());
   }
 
-  map.remove(11);
+  map.erase(11);
   iter = map.find(11);
   EXPECT_TRUE(iter == map.end());
 
   MoveOnly oneThirty(map.take(13));
   EXPECT_EQ(130, oneThirty.value());
   iter = map.find(13);
   EXPECT_TRUE(iter == map.end());
 
   map.clear();
 }
@@ skipping 34 matching lines @@
   EXPECT_EQ(7, iter->key.value());
   EXPECT_EQ(70, iter->value);
 
   {
     TheMap::AddResult addResult = map.set(MoveOnly(9), 999);
     EXPECT_FALSE(addResult.isNewEntry);
     EXPECT_EQ(9, addResult.storedValue->key.value());
     EXPECT_EQ(999, addResult.storedValue->value);
   }
 
-  map.remove(MoveOnly(11));
+  map.erase(MoveOnly(11));
   iter = map.find(MoveOnly(11));
   EXPECT_TRUE(iter == map.end());
 
   int oneThirty = map.take(MoveOnly(13));
   EXPECT_EQ(130, oneThirty);
   iter = map.find(MoveOnly(13));
   EXPECT_TRUE(iter == map.end());
 
   map.clear();
 }
@@ skipping 166 matching lines @@
   EXPECT_EQ(70, iter->value);
 
   {
     TheMap::AddResult addResult = map.set(Pair(MoveOnly(9), -9), 999);
     EXPECT_FALSE(addResult.isNewEntry);
     EXPECT_EQ(9, addResult.storedValue->key.first.value());
     EXPECT_EQ(-9, addResult.storedValue->key.second);
     EXPECT_EQ(999, addResult.storedValue->value);
   }
 
-  map.remove(Pair(MoveOnly(11), -11));
+  map.erase(Pair(MoveOnly(11), -11));
   iter = map.find(Pair(MoveOnly(11), -11));
   EXPECT_TRUE(iter == map.end());
 
   int oneThirty = map.take(Pair(MoveOnly(13), -13));
   EXPECT_EQ(130, oneThirty);
   iter = map.find(Pair(MoveOnly(13), -13));
   EXPECT_TRUE(iter == map.end());
 
   map.clear();
 }
@@ skipping 50 matching lines @@
 
   // Other ways of construction: as a function parameter and in a return
   // statement.
   EXPECT_TRUE(isOneTwoThree({{1, 11}, {2, 22}, {3, 33}}));
   EXPECT_TRUE(isOneTwoThree(returnOneTwoThree()));
 }
 
 }  // anonymous namespace
 
 }  // namespace WTF