base: Remove dereference structure operator (i.e ->) from ScopedVector.

ui/base/models/tree_node_model.h

 // Copyright (c) 2011 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 UI_BASE_MODELS_TREE_NODE_MODEL_H_
 #define UI_BASE_MODELS_TREE_NODE_MODEL_H_
 #pragma once
 
 #include <algorithm>
 #include <vector>
@@ skipping 63 matching lines @@
   // Adds |node| as a child of this node, at |index|.
   virtual void Add(NodeType* node, int index) {
     DCHECK(node);
     DCHECK_GE(index, 0);
     DCHECK_LE(index, child_count());
     // If |node| has a parent, remove it from its parent.
     NodeType* parent = node->parent_;
     if (parent)
       parent->Remove(node);
     node->parent_ = static_cast<NodeType*>(this);
-    children_->insert(children_->begin() + index, node);
+    children_.insert(children_.begin() + index, node);
   }
 
   // Removes |node| from this node and returns it. It's up to the caller to
   // delete it.
   virtual NodeType* Remove(NodeType* node) {
     typename std::vector<NodeType*>::iterator i =
-        std::find(children_->begin(), children_->end(), node);
-    DCHECK(i != children_->end());
+        std::find(children_.begin(), children_.end(), node);
+    DCHECK(i != children_.end());
     node->parent_ = NULL;
-    children_->erase(i);
+    children_.weak_erase(i);
     return node;
   }
 
   // Removes all the children from this node. This does NOT delete the nodes.
   void RemoveAll() {
-    for (size_t i = 0; i < children_->size(); ++i)
+    for (size_t i = 0; i < children_.size(); ++i)
       children_[i]->parent_ = NULL;
-    children_->clear();
+    children_.clear();
   }
 
   // Returns the parent node, or NULL if this is the root node.
   const NodeType* parent() const { return parent_; }
   NodeType* parent() { return parent_; }
 
   // Returns true if this is the root node.
   bool is_root() const { return parent_ == NULL; }
 
   // Returns the number of children.
-  int child_count() const { return static_cast<int>(children_->size()); }
+  int child_count() const { return static_cast<int>(children_.size()); }
 
   // Returns true if this node has no children.
-  bool empty() const { return children_->empty(); }
+  bool empty() const { return children_.empty(); }
 
   // Returns the number of all nodes in the subtree rooted at this node,
   // including this node.
   int GetTotalNodeCount() const {
     int count = 1;  // Start with one to include the node itself.
-    for (size_t i = 0; i < children_->size(); ++i)
+    for (size_t i = 0; i < children_.size(); ++i)
       count += children_[i]->GetTotalNodeCount();
     return count;
   }
 
   // Returns the node at |index|.
   const NodeType* GetChild(int index) const {
     DCHECK_GE(index, 0);
     DCHECK_LT(index, child_count());
     return children_[index];
   }
   NodeType* GetChild(int index) {
     return const_cast<NodeType*>(
         static_cast<const NodeType&>(*this).GetChild(index));
   }
 
   // Returns the index of |node|, or -1 if |node| is not a child of this.
   int GetIndexOf(const NodeType* node) const {
     DCHECK(node);
     typename std::vector<NodeType*>::const_iterator i =
-        std::find(children_->begin(), children_->end(), node);
-    return
-        i != children_->end() ? static_cast<int>(i - children_->begin()) : -1;
+        std::find(children_.begin(), children_.end(), node);
+    return i != children_.end() ? static_cast<int>(i - children_.begin()) : -1;
   }
 
   // Sets the title of the node.
   virtual void SetTitle(const string16& title) { title_ = title; }
 
   // TreeModelNode:
   virtual const string16& GetTitle() const OVERRIDE { return title_; }
 
   // Returns true if this == ancestor, or one of this nodes parents is
   // ancestor.
@@ skipping 134 matching lines @@
 
   // The root.
   scoped_ptr<NodeType> root_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeNodeModel);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_MODELS_TREE_NODE_MODEL_H_