Remove the use of STLDeleteContainerPointers from ScopedVector.

base/memory/scoped_vector.h

 // 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.
 
 #ifndef BASE_MEMORY_SCOPED_VECTOR_H_
 #define BASE_MEMORY_SCOPED_VECTOR_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 
 // ScopedVector wraps a vector deleting the elements from its
 // destructor.
 //
 // TODO(http://crbug.com/554289): DEPRECATED: Use std::vector instead (now that
 // we have support for moveable types inside containers).
 template <class T>
 class ScopedVector {
  public:
   typedef typename std::vector<T*>::allocator_type allocator_type;
@@ skipping 55 matching lines @@
   void swap(ScopedVector<T>& other) { v_.swap(other.v_); }
   void release(std::vector<T*>* out) {
     out->swap(v_);
     v_.clear();
   }
 
   void reserve(size_t capacity) { v_.reserve(capacity); }
 
   // Resize, deleting elements in the disappearing range if we are shrinking.
   void resize(size_t new_size) {
-    if (v_.size() > new_size)
-      base::STLDeleteContainerPointers(v_.begin() + new_size, v_.end());
+    if (v_.size() > new_size) {
+      for (auto it = v_.begin() + new_size; it != v_.end(); ++it)
+        delete *it;
+    }
     v_.resize(new_size);
   }
 
   template<typename InputIterator>
   void assign(InputIterator begin, InputIterator end) {
     v_.assign(begin, end);
   }
 
-  void clear() { base::STLDeleteElements(&v_); }
+  void clear() {
+    for (auto* item : *this)
+      delete item;
+    v_.clear();
+  }
 
   // Like |clear()|, but doesn't delete any elements.
   void weak_clear() { v_.clear(); }
 
   // Lets the ScopedVector take ownership of |x|.
   iterator insert(iterator position, T* x) {
     return v_.insert(position, x);
   }
 
   iterator insert(iterator position, std::unique_ptr<T> x) {
     return v_.insert(position, x.release());
   }
 
   // Lets the ScopedVector take ownership of elements in [first,last).
   template<typename InputIterator>
   void insert(iterator position, InputIterator first, InputIterator last) {
     v_.insert(position, first, last);
   }
 
   iterator erase(iterator position) {
     delete *position;
     return v_.erase(position);
   }
 
   iterator erase(iterator first, iterator last) {
-    base::STLDeleteContainerPointers(first, last);
+    for (auto it = first; it != last; ++it)
+      delete *it;
     return v_.erase(first, last);
   }
 
   // Like |erase()|, but doesn't delete the element at |position|.
   iterator weak_erase(iterator position) {
     return v_.erase(position);
   }
 
   // Like |erase()|, but doesn't delete the elements in [first, last).
   iterator weak_erase(iterator first, iterator last) {
     return v_.erase(first, last);
   }
 
  private:
   std::vector<T*> v_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedVector);
 };
 
 #endif  // BASE_MEMORY_SCOPED_VECTOR_H_