cc: Remove ScopedPtrVector and cc::remove_if.

cc/animation/layer_animation_controller.h

 // 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.
 
 #ifndef CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
 #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/layer_animation_event_observer.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
 class BoxF;
 class Transform;
 }
 
 namespace cc {
 
@@ skipping 189 matching lines @@
       bool notify_active_observers,
       bool notify_pending_observers);
 
   void UpdatePotentiallyAnimatingTransform();
 
   bool HasValueObserver();
   bool HasActiveValueObserver();
 
   AnimationRegistrar* registrar_;
   int id_;
-  ScopedPtrVector<Animation> animations_;
+  std::vector<scoped_ptr<Animation>> animations_;
 
   // This is used to ensure that we don't spam the registrar.
   bool is_active_;
 
   base::TimeTicks last_tick_time_;
 
   base::ObserverList<LayerAnimationValueObserver> value_observers_;
   base::ObserverList<LayerAnimationEventObserver> event_observers_;
 
   LayerAnimationValueProvider* value_provider_;
 
   AnimationDelegate* layer_animation_delegate_;
 
   // Only try to start animations when new animations are added or when the
   // previous attempt at starting animations failed to start all animations.
   bool needs_to_start_animations_;
 
   bool scroll_offset_animation_was_interrupted_;
 
   bool potentially_animating_transform_for_active_observers_;
   bool potentially_animating_transform_for_pending_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerAnimationController);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_