cc: Remove ScopedPtrVector and cc::remove_if.

cc/animation/animation_player.cc

 // 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.
 
 #include "cc/animation/animation_player.h"
 
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/animation/element_animations.h"
@@ skipping 87 matching lines @@
   animation_host_->UnregisterPlayerForLayer(layer_id_, this);
 }
 
 void AnimationPlayer::BindElementAnimations() {
   DCHECK(!element_animations_);
   element_animations_ =
       animation_host_->GetElementAnimationsForLayerId(layer_id_);
   DCHECK(element_animations_);
 
   // Pass all accumulated animations to LAC.
   for (auto it = animations_.begin(); it != animations_.end(); ++it)

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

This could be

for (auto& animation : animations_)
  eleme...->AddAnimation(animation.Pass());

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

Done.

-    element_animations_->layer_animation_controller()->AddAnimation(
-        animations_.take(it));
+    element_animations_->layer_animation_controller()->AddAnimation(it->Pass());
   if (!animations_.empty())
     SetNeedsCommit();
   animations_.clear();
 }
 
 void AnimationPlayer::UnbindElementAnimations() {
   element_animations_ = nullptr;
   DCHECK(animations_.empty());
 }
 
@@ skipping 16 matching lines @@
       animation_id, base::TimeDelta::FromSecondsD(time_offset));
   SetNeedsCommit();
 }
 
 void AnimationPlayer::RemoveAnimation(int animation_id) {
   if (element_animations_) {
     element_animations_->layer_animation_controller()->RemoveAnimation(
         animation_id);
     SetNeedsCommit();
   } else {
-    auto animations_to_remove = animations_.remove_if([animation_id](
-        Animation* animation) { return animation->id() == animation_id; });
+    auto animations_to_remove =
+        std::remove_if(animations_.begin(), animations_.end(),
+                       [animation_id](const scoped_ptr<Animation>& animation) {
+                         return animation->id() == animation_id;
+                       });
     animations_.erase(animations_to_remove, animations_.end());
   }
 }
 
 void AnimationPlayer::PushPropertiesTo(AnimationPlayer* player_impl) {
   if (!element_animations_) {
     if (player_impl->element_animations())
       player_impl->DetachLayer();
     return;
   }
@@ skipping 21 matching lines @@
                                                        target_property, group);
 }
 
 void AnimationPlayer::SetNeedsCommit() {
   DCHECK(animation_host_);
   animation_host_->SetNeedsCommit();
   animation_host_->SetNeedsRebuildPropertyTrees();
 }
 
 }  // namespace cc