cc: Remove ScopedPtrVector and cc::remove_if.

cc/animation/keyframed_animation_curve.cc

 // Copyright 2012 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.
 
 #include <algorithm>
 
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/base/time_util.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/geometry/box_f.h"
 
 namespace cc {
 
 namespace {
 
 template <class KeyframeType>
 void InsertKeyframe(scoped_ptr<KeyframeType> keyframe,
-                    ScopedPtrVector<KeyframeType>* keyframes) {
+                    std::vector<scoped_ptr<KeyframeType>>* keyframes) {
   // Usually, the keyframes will be added in order, so this loop would be
   // unnecessary and we should skip it if possible.
   if (!keyframes->empty() && keyframe->Time() < keyframes->back()->Time()) {
     for (size_t i = 0; i < keyframes->size(); ++i) {
       if (keyframe->Time() < keyframes->at(i)->Time()) {
         keyframes->insert(keyframes->begin() + i, keyframe.Pass());
         return;
       }
     }
   }
 
   keyframes->push_back(keyframe.Pass());
 }
 
 template <typename KeyframeType>
 base::TimeDelta TransformedAnimationTime(
-    const ScopedPtrVector<KeyframeType>& keyframes,
+    const std::vector<scoped_ptr<KeyframeType>>& keyframes,
     const scoped_ptr<TimingFunction>& timing_function,
     base::TimeDelta time) {
   if (timing_function) {
     base::TimeDelta start_time = keyframes.front()->Time();
     base::TimeDelta duration =
         keyframes.back()->Time() - keyframes.front()->Time();
     double progress = TimeUtil::Divide(time - start_time, duration);
 
     time = TimeUtil::Scale(duration, timing_function->GetValue(progress)) +
            start_time;
   }
 
   return time;
 }
 
 template <typename KeyframeType>
-size_t GetActiveKeyframe(const ScopedPtrVector<KeyframeType>& keyframes,
+size_t GetActiveKeyframe(const std::vector<scoped_ptr<KeyframeType>>& keyframes,
                          base::TimeDelta time) {
   DCHECK_GE(keyframes.size(), 2ul);
   size_t i = 0;
   for (; i < keyframes.size() - 2; ++i) {  // Last keyframe is never active.
     if (time < keyframes[i + 1]->Time())
       break;
   }
 
   return i;
 }
 
 template <typename KeyframeType>
 double TransformedKeyframeProgress(
-    const ScopedPtrVector<KeyframeType>& keyframes,
+    const std::vector<scoped_ptr<KeyframeType>>& keyframes,
     base::TimeDelta time,
     size_t i) {
   double progress =
       TimeUtil::Divide(time - keyframes[i]->Time(),
                        keyframes[i + 1]->Time() - keyframes[i]->Time());
 
   if (keyframes[i]->timing_function()) {
     progress = keyframes[i]->timing_function()->GetValue(progress);
   }
 
@@ skipping 399 matching lines @@
 bool KeyframedFilterAnimationCurve::HasFilterThatMovesPixels() const {
   for (size_t i = 0; i < keyframes_.size(); ++i) {
     if (keyframes_[i]->Value().HasFilterThatMovesPixels()) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace cc