cc: Remove ScopedPtrVector and cc::remove_if.

cc/animation/animation_player.h

 // Copyright 2015 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_ANIMATION_PLAYER_H_
 #define CC_ANIMATION_ANIMATION_PLAYER_H_
 
+#include <vector>
+
 #include "base/containers/linked_list.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "cc/animation/animation.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
 
 namespace cc {
 
 class AnimationDelegate;
 class AnimationHost;
 class AnimationTimeline;
 class ElementAnimations;
 class LayerAnimationController;
 enum class LayerTreeType;
 
@@ skipping 63 matching lines @@
 
   void RegisterPlayer();
   void UnregisterPlayer();
 
   void BindElementAnimations();
   void UnbindElementAnimations();
 
   // We accumulate added animations in animations_ container
   // if element_animations_ is a nullptr. It allows us to add/remove animations
   // to non-attached AnimationPlayers.
-  typedef ScopedPtrVector<Animation> AnimationList;
+  typedef std::vector<scoped_ptr<Animation>> AnimationList;

[danakj, 2015/11/17 01:12:16]

drop the typedef, just use the concrete type?

[vmpstr, 2015/11/17 23:26:23]

Done.

   AnimationList animations_;
 
   AnimationHost* animation_host_;
   AnimationTimeline* animation_timeline_;
   // element_animations isn't null if player attached to an element (layer).
   ElementAnimations* element_animations_;
   AnimationDelegate* layer_animation_delegate_;
 
   int id_;
   int layer_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationPlayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_PLAYER_H_