cc: Make the ScopedPtrVector and ScopedPtrDeque containers act like STL vector and deque.

cc/scoped_ptr_deque.h

Index: cc/scoped_ptr_deque.h
diff --git a/cc/scoped_ptr_deque.h b/cc/scoped_ptr_deque.h
index 64f09a8a8ec11f2a6f66ea5f9df41017ef21296d..f5eddea00fc2537e9d25187e2484921755d96563 100644
--- a/cc/scoped_ptr_deque.h
+++ b/cc/scoped_ptr_deque.h
@@ -18,10 +18,24 @@ namespace cc {
 template <typename T>
 class ScopedPtrDeque {
  public:
-  typedef typename std::deque<T*>::iterator iterator;
   typedef typename std::deque<T*>::const_iterator const_iterator;
   typedef typename std::deque<T*>::reverse_iterator reverse_iterator;
-  typedef typename std::deque<T*>::const_reverse_iterator const_reverse_iterator;
+  typedef typename std::deque<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::deque<T*>::iterator iterator;
+#else
+  // Ban setting values on the iterator directly. New pointers must be passed
+  // to methods on the ScopedPtrDeque class to appear in the deque.
+  class iterator : public std::deque<T*>::iterator {
+   public:
+    iterator(const typename std::deque<T*>::iterator& other)
+        : std::deque<T*>::iterator(other) {}
+    T* const& operator*() { return std::deque<T*>::iterator::operator*(); }
+  };
+#endif
 
   ScopedPtrDeque() {}
 
@@ -31,37 +45,37 @@ class ScopedPtrDeque {
     return data_.size();
   }
 
-  T* Peek(size_t index) const {
+  T* at(size_t index) const {
     DCHECK(index < size());
     return data_[index];
   }
 
   T* operator[](size_t index) const {
-    return Peek(index);
+    return at(index);
   }
 
-  T* first() const {
-    DCHECK(!isEmpty());
-    return Peek(0);
+  T* front() const {
+    DCHECK(!empty());
+    return at(0);
   }
 
-  T* last() const {
-    DCHECK(!isEmpty());
-    return Peek(size() - 1);
+  T* back() const {
+    DCHECK(!empty());
+    return at(size() - 1);
   }
 
-  bool isEmpty() const {
-    return size() == 0;
+  bool empty() const {
+    return data_.empty();
   }
 
-  scoped_ptr<T> takeFirst() {
-    scoped_ptr<T> ret(first());
+  scoped_ptr<T> take_front() {
+    scoped_ptr<T> ret(front());
     data_.pop_front();
     return ret.Pass();
   }
 
-  scoped_ptr<T> takeLast() {
-    scoped_ptr<T> ret(last());
+  scoped_ptr<T> take_back() {
+    scoped_ptr<T> ret(back());
     data_.pop_back();
     return ret.Pass();
   }
@@ -70,18 +84,32 @@ class ScopedPtrDeque {
     STLDeleteElements(&data_);
   }
 
-  void append(scoped_ptr<T> item) {
+  void push_front(scoped_ptr<T> item) {
+    data_.push_front(item.release());
+  }
+
+  void push_back(scoped_ptr<T> item) {
     data_.push_back(item.release());
   }
 
-  void insert(size_t index, scoped_ptr<T> item) {
-    DCHECK(index < size());
-    data_.insert(data_.begin() + index, item.release());
+  void insert(iterator position, scoped_ptr<T> item) {
+    DCHECK(position <= end());
+    data_.insert(position, item.release());
+  }
+
+  void swap(iterator a, iterator b) {
+    DCHECK(a < end());
+    DCHECK(b < end());
+    if (a == end() || b == end() || a == b)
+      return;
+    typename std::deque<T*>::iterator writable_a = a;
+    typename std::deque<T*>::iterator writable_b = b;
+    std::swap(*writable_a, *writable_b);
   }
 
-  iterator begin() { return data_.begin(); }
+  iterator begin() { return static_cast<iterator>(data_.begin()); }
   const_iterator begin() const { return data_.begin(); }
-  iterator end() { return data_.end(); }
+  iterator end() { return static_cast<iterator>(data_.end()); }
   const_iterator end() const { return data_.end(); }
 
   reverse_iterator rbegin() { return data_.rbegin(); }