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

third_party/WebKit/Source/wtf/HashMap.h

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 132 matching lines @@
   // new value was actually added
   template <typename IncomingKeyType, typename IncomingMappedType>
   AddResult set(IncomingKeyType&&, IncomingMappedType&&);
 
   // does nothing if key is already present return value is a pair of the
   // iterator to the key location, and a boolean that's true if a new value
   // was actually added
   template <typename IncomingKeyType, typename IncomingMappedType>
   AddResult insert(IncomingKeyType&&, IncomingMappedType&&);
 
-  // TODO(pilgrim) remove remove() method once all references migrated to
-  // erase()
-  // https://crbug.com/662431
-  void remove(KeyPeekInType);
   void erase(KeyPeekInType);
-  void remove(iterator);
+  void erase(iterator);
   void clear();
   template <typename Collection>
   void removeAll(const Collection& toBeRemoved) {
     WTF::removeAll(*this, toBeRemoved);
   }
 
   MappedType take(KeyPeekInType);  // efficient combination of get with remove
 
   // An alternate version of find() that finds the object by hashing and
   // comparing with some other type, to avoid the cost of type
@@ skipping 432 matching lines @@
     return MappedTraits::peek(MappedTraits::emptyValue());
   return MappedTraits::peek(entry->value);
 }
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
-inline void HashMap<T, U, V, W, X, Y>::remove(iterator it) {
+inline void HashMap<T, U, V, W, X, Y>::erase(iterator it) {
   m_impl.remove(it.m_impl);
 }
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
-inline void HashMap<T, U, V, W, X, Y>::remove(KeyPeekInType key) {
-  remove(find(key));
-}
-
-template <typename T,
-          typename U,
-          typename V,
-          typename W,
-          typename X,
-          typename Y>
 inline void HashMap<T, U, V, W, X, Y>::erase(KeyPeekInType key) {
-  remove(find(key));
+  erase(find(key));
 }
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
 inline void HashMap<T, U, V, W, X, Y>::clear() {
   m_impl.clear();
 }
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
 auto HashMap<T, U, V, W, X, Y>::take(KeyPeekInType key) -> MappedType {
   iterator it = find(key);
   if (it == end())
     return MappedTraits::emptyValue();
   MappedType result = std::move(it->value);
-  remove(it);
+  erase(it);
   return result;
 }
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
 inline bool HashMap<T, U, V, W, X, Y>::isValidKey(KeyPeekInType key) {
@@ skipping 84 matching lines @@
   iterator end = collection.end().values();
   for (unsigned i = 0; it != end; ++it, ++i)
     vector[i] = *it;
 }
 
 }  // namespace WTF
 
 using WTF::HashMap;
 
 #endif  // WTF_HashMap_h