cc: Remove ScopedPtrVector and cc::remove_if.

cc/debug/micro_benchmark_controller_impl.h

Index: cc/debug/micro_benchmark_controller_impl.h
diff --git a/cc/debug/micro_benchmark_controller_impl.h b/cc/debug/micro_benchmark_controller_impl.h
index 734bf63ce6bcecabeb436a59a14542159a4c973a..6fdf0438920de5828ba45d02490de4afdb8f295f 100644
--- a/cc/debug/micro_benchmark_controller_impl.h
+++ b/cc/debug/micro_benchmark_controller_impl.h
@@ -6,9 +6,9 @@
 #define CC_DEBUG_MICRO_BENCHMARK_CONTROLLER_IMPL_H_
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/debug/micro_benchmark_impl.h"
 
 namespace cc {
@@ -27,7 +27,7 @@ class CC_EXPORT MicroBenchmarkControllerImpl {
   void CleanUpFinishedBenchmarks();
 
   LayerTreeHostImpl* host_;
-  ScopedPtrVector<MicroBenchmarkImpl> benchmarks_;
+  std::vector<scoped_ptr<MicroBenchmarkImpl>> benchmarks_;
 
   DISALLOW_COPY_AND_ASSIGN(MicroBenchmarkControllerImpl);
 };