Migrate WTF::HashSet::remove() to ::erase() [part 2]

third_party/WebKit/Source/wtf/HashSet.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 90 matching lines @@
   //   static bool equal(const ValueType&, const T&);
   template <typename HashTranslator, typename T>
   iterator find(const T&) const;
   template <typename HashTranslator, typename T>
   bool contains(const T&) const;
 
   // The return value is a pair of an iterator to the new value's location,
   // and a bool that is true if an new entry was added.
   template <typename IncomingValueType>
   AddResult insert(IncomingValueType&&);
-  // TODO(pilgrim) remove this
-  // template <typename IncomingValueType>
-  // AddResult add(IncomingValueType&&);
 
   // An alternate version of add() that finds the object by hashing and
   // comparing with some other type, to avoid the cost of type conversion if
   // the object is already in the table. HashTranslator must have the
   // following function members:
   //   static unsigned hash(const T&);
   //   static bool equal(const ValueType&, const T&);
   //   static translate(ValueType&, T&&, unsigned hashCode);
   template <typename HashTranslator, typename T>
   AddResult addWithTranslator(T&&);
 
   void erase(ValuePeekInType);
-  void remove(iterator);
+  void erase(iterator);
   void clear();
   template <typename Collection>
   void removeAll(const Collection& toBeRemoved) {
     WTF::removeAll(*this, toBeRemoved);
   }
 
   ValueType take(iterator);
   ValueType take(ValuePeekInType);
   ValueType takeAny();
 
@@ skipping 131 matching lines @@
 inline typename HashSet<Value, HashFunctions, Traits, Allocator>::AddResult
 HashSet<Value, HashFunctions, Traits, Allocator>::addWithTranslator(T&& value) {
   // Forward only the first argument, because the second argument isn't actually
   // used in HashSetTranslatorAdapter.
   return m_impl
       .template addPassingHashCode<HashSetTranslatorAdapter<HashTranslator>>(
           std::forward<T>(value), value);
 }
 
 template <typename T, typename U, typename V, typename W>
-inline void HashSet<T, U, V, W>::remove(iterator it) {
+inline void HashSet<T, U, V, W>::erase(iterator it) {
   m_impl.remove(it.m_impl);
 }
 
 template <typename T, typename U, typename V, typename W>
 inline void HashSet<T, U, V, W>::erase(ValuePeekInType value) {
-  remove(find(value));
+  erase(find(value));
 }
 
 template <typename T, typename U, typename V, typename W>
 inline void HashSet<T, U, V, W>::clear() {
   m_impl.clear();
 }
 
 template <typename T, typename U, typename V, typename W>
 inline auto HashSet<T, U, V, W>::take(iterator it) -> ValueType {
   if (it == end())
     return ValueTraits::emptyValue();
 
   ValueType result = std::move(const_cast<ValueType&>(*it));
-  remove(it);
+  erase(it);
 
   return result;
 }
 
 template <typename T, typename U, typename V, typename W>
 inline auto HashSet<T, U, V, W>::take(ValuePeekInType value) -> ValueType {
   return take(find(value));
 }
 
 template <typename T, typename U, typename V, typename W>
@@ skipping 15 matching lines @@
   iterator end = collection.end();
   for (unsigned i = 0; it != end; ++it, ++i)
     vector[i] = *it;
 }
 
 }  // namespace WTF
 
 using WTF::HashSet;
 
 #endif  // WTF_HashSet_h