cc: Remove ScopedPtrVector and cc::remove_if.

cc/debug/micro_benchmark_controller.h

 // Copyright 2013 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 CC_DEBUG_MICRO_BENCHMARK_CONTROLLER_H_
 #define CC_DEBUG_MICRO_BENCHMARK_CONTROLLER_H_
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/debug/micro_benchmark.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class Value;
 }  // namespace base
 
 namespace cc {
 
 class LayerTreeHost;
@@ skipping 12 matching lines @@
   // Returns true if the message was successfully delivered and handled.
   bool SendMessage(int id, scoped_ptr<base::Value> value);
 
   void ScheduleImplBenchmarks(LayerTreeHostImpl* host_impl);
 
  private:
   void CleanUpFinishedBenchmarks();
   int GetNextIdAndIncrement();
 
   LayerTreeHost* host_;
-  ScopedPtrVector<MicroBenchmark> benchmarks_;
+  std::vector<scoped_ptr<MicroBenchmark>> benchmarks_;
   static int next_id_;
   scoped_refptr<base::SingleThreadTaskRunner> main_controller_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MicroBenchmarkController);
 };
 
 }  // namespace cc
 
 #endif  // CC_DEBUG_MICRO_BENCHMARK_CONTROLLER_H_