cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_host_common_perftest.cc

Index: cc/trees/layer_tree_host_common_perftest.cc
diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc
index 968224f2d297a99870de9c880ce13635730b3810..1373af855fc74026942d3a2b83dc28c685270716 100644
--- a/cc/trees/layer_tree_host_common_perftest.cc
+++ b/cc/trees/layer_tree_host_common_perftest.cc
@@ -14,7 +14,6 @@
 #include "base/strings/string_piece.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer.h"
 #include "cc/output/bsp_tree.h"
@@ -154,7 +153,7 @@ class BspTreePerfTest : public CalcDrawPropsTest {
     BuildLayerImplList(active_tree->root_layer(), &base_list);
 
     int polygon_counter = 0;
-    ScopedPtrVector<DrawPolygon> polygon_list;
+    std::vector<scoped_ptr<DrawPolygon>> polygon_list;
     for (LayerImplList::iterator it = base_list.begin(); it != base_list.end();
          ++it) {
       DrawPolygon* draw_polygon =
@@ -184,7 +183,7 @@ class BspTreePerfTest : public CalcDrawPropsTest {
     }
 
     for (size_t i = 0; i < layer->children().size(); i++) {
-      BuildLayerImplList(layer->children()[i], list);
+      BuildLayerImplList(layer->children()[i].get(), list);
     }
   }