cc: Remove ScopedPtrVector and cc::remove_if.

cc/animation/keyframed_animation_curve.h

Index: cc/animation/keyframed_animation_curve.h
diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h
index b5dfb14628fabe044de8a155161655fe0a050743..ddaaaf71d38b8e83f875baa2551947744e5f44ab 100644
--- a/cc/animation/keyframed_animation_curve.h
+++ b/cc/animation/keyframed_animation_curve.h
@@ -5,12 +5,13 @@
 #ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 
+#include <vector>
+
 #include "base/time/time.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/timing_function.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
 
 namespace cc {
 
@@ -136,7 +137,7 @@ class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve {
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<ColorKeyframe> keyframes_;
+  std::vector<scoped_ptr<ColorKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedColorAnimationCurve);
@@ -166,7 +167,7 @@ class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve {
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<FloatKeyframe> keyframes_;
+  std::vector<scoped_ptr<FloatKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedFloatAnimationCurve);
@@ -206,7 +207,7 @@ class CC_EXPORT KeyframedTransformAnimationCurve
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<TransformKeyframe> keyframes_;
+  std::vector<scoped_ptr<TransformKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve);
@@ -238,7 +239,7 @@ class CC_EXPORT KeyframedFilterAnimationCurve
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<FilterKeyframe> keyframes_;
+  std::vector<scoped_ptr<FilterKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedFilterAnimationCurve);