cc: Remove ScopedPtrVector and cc::remove_if.

cc/output/bsp_tree.h

Index: cc/output/bsp_tree.h
diff --git a/cc/output/bsp_tree.h b/cc/output/bsp_tree.h
index 0a0b94845643dfc25beb9a855f398aede5ff023c..efe4cc5111aaf9d9339dda239418af7361d2d4d5 100644
--- a/cc/output/bsp_tree.h
+++ b/cc/output/bsp_tree.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/bsp_compare_result.h"
 #include "cc/quads/draw_polygon.h"
 
@@ -19,8 +18,8 @@ struct BspNode {
   // This represents the splitting plane.
   scoped_ptr<DrawPolygon> node_data;
   // This represents any coplanar geometry we found while building the BSP.
-  ScopedPtrVector<DrawPolygon> coplanars_front;
-  ScopedPtrVector<DrawPolygon> coplanars_back;
+  std::vector<scoped_ptr<DrawPolygon>> coplanars_front;
+  std::vector<scoped_ptr<DrawPolygon>> coplanars_back;
 
   scoped_ptr<BspNode> back_child;
   scoped_ptr<BspNode> front_child;
@@ -46,7 +45,7 @@ class CC_EXPORT BspTree {
  private:
   scoped_ptr<BspNode> root_;
 
-  void FromList(ScopedPtrVector<DrawPolygon>* list);
+  void FromList(std::vector<scoped_ptr<DrawPolygon>>* list);
   void BuildTree(BspNode* node, std::deque<scoped_ptr<DrawPolygon>>* data);
 
   template <typename ActionHandlerType>
@@ -61,17 +60,17 @@ class CC_EXPORT BspTree {
       const BspNode* node,
       const BspNode* first_child,
       const BspNode* second_child,
-      const ScopedPtrVector<DrawPolygon>& first_coplanars,
-      const ScopedPtrVector<DrawPolygon>& second_coplanars) const {
+      const std::vector<scoped_ptr<DrawPolygon>>& first_coplanars,
+      const std::vector<scoped_ptr<DrawPolygon>>& second_coplanars) const {
     if (first_child) {
       WalkInOrderRecursion(action_handler, first_child);
     }
     for (size_t i = 0; i < first_coplanars.size(); i++) {
-      WalkInOrderAction(action_handler, first_coplanars[i]);
+      WalkInOrderAction(action_handler, first_coplanars[i].get());
     }
     WalkInOrderAction(action_handler, node->node_data.get());
     for (size_t i = 0; i < second_coplanars.size(); i++) {
-      WalkInOrderAction(action_handler, second_coplanars[i]);
+      WalkInOrderAction(action_handler, second_coplanars[i].get());
     }
     if (second_child) {
       WalkInOrderRecursion(action_handler, second_child);