ScopedPtrVector change back const_iterator typedef

cc/base/scoped_ptr_vector.h

 // Copyright 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 CC_BASE_SCOPED_PTR_VECTOR_H_
 #define CC_BASE_SCOPED_PTR_VECTOR_H_
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 
 namespace cc {
 
 // This type acts like a vector<scoped_ptr> based on top of std::vector. The
 // ScopedPtrVector has ownership of all elements in the vector.
 template <typename T>
 class ScopedPtrVector {
  public:
-  typedef typename std::vector<const T*>::const_iterator const_iterator;
+  typedef typename std::vector<T*>::const_iterator const_iterator;
   typedef typename std::vector<T*>::reverse_iterator reverse_iterator;
   typedef typename std::vector<T*>::const_reverse_iterator
       const_reverse_iterator;
 
 #if defined(OS_ANDROID)
   // On Android the iterator is not a class, so we can't block assignment.
   typedef typename std::vector<T*>::iterator iterator;
 #else
   // Ban setting values on the iterator directly. New pointers must be passed
   // to methods on the ScopedPtrVector class to appear in the vector.
@@ skipping 88 matching lines @@
   void pop_back() {
     delete data_.back();
     data_.pop_back();
   }
 
   void insert(iterator position, scoped_ptr<T> item) {
     DCHECK(position <= end());
     data_.insert(position, item.release());
   }
 
-  void insert_and_take(iterator position,
-                       ScopedPtrVector<T>& other) {
+  void insert_and_take(iterator position, ScopedPtrVector<T>* other) {
     std::vector<T*> tmp_data;
-    for (ScopedPtrVector<T>::iterator it = other.begin();
-         it != other.end();
+    for (ScopedPtrVector<T>::iterator it = other->begin(); it != other->end();
          ++it) {
-      tmp_data.push_back(other.take(it).release());
+      tmp_data.push_back(other->take(it).release());
     }
     data_.insert(position, tmp_data.begin(), tmp_data.end());
   }
 
   template <typename Predicate>
   iterator partition(Predicate predicate) {
     typename std::vector<T*>::iterator first = begin();
     typename std::vector<T*>::iterator last = end();
     return static_cast<iterator>(std::partition(first, last, predicate));
   }
@@ skipping 44 matching lines @@
 
  private:
   std::vector<T*> data_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedPtrVector);
 };
 
 }  // namespace cc
 
 #endif  // CC_BASE_SCOPED_PTR_VECTOR_H_