CC Animations: Rewrite unit tests to work with AnimationPlayer.

cc/animation/scroll_offset_animations_impl.cc

 // Copyright 2013 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/scroll_offset_animations_impl.h"
 
 #include "cc/animation/animation_events.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
@@ skipping 52 matching lines @@
     const gfx::Vector2dF& scroll_delta,
     const gfx::ScrollOffset& max_scroll_offset,
     base::TimeTicks frame_monotonic_time,
     base::TimeDelta delayed_by) {
   DCHECK(scroll_offset_animation_player_);
   if (!scroll_offset_animation_player_->element_animations())
     return false;
 
   DCHECK_EQ(element_id, scroll_offset_animation_player_->element_id());
 
-  Animation* animation =
-      scroll_offset_animation_player_->element_animations()->GetAnimation(
-          TargetProperty::SCROLL_OFFSET);
+  Animation* animation = scroll_offset_animation_player_->GetAnimation(
+      TargetProperty::SCROLL_OFFSET);
   if (!animation) {
     scroll_offset_animation_player_->DetachElement();
     return false;
   }
   if (scroll_delta.IsZero())
     return true;
 
   ScrollOffsetAnimationCurve* curve =
       animation->curve()->ToScrollOffsetAnimationCurve();
 
@@ skipping 22 matching lines @@
 void ScrollOffsetAnimationsImpl::ScrollAnimationApplyAdjustment(
     ElementId element_id,
     const gfx::Vector2dF& adjustment) {
   DCHECK(scroll_offset_animation_player_);
   if (element_id != scroll_offset_animation_player_->element_id())
     return;
 
   if (!scroll_offset_animation_player_->element_animations())
     return;
 
-  Animation* animation =
-      scroll_offset_animation_player_->element_animations()->GetAnimation(
-          TargetProperty::SCROLL_OFFSET);
+  Animation* animation = scroll_offset_animation_player_->GetAnimation(
+      TargetProperty::SCROLL_OFFSET);
   if (!animation)
     return;
 
   std::unique_ptr<ScrollOffsetAnimationCurve> new_curve =
       animation->curve()
           ->ToScrollOffsetAnimationCurve()
           ->CloneToScrollOffsetAnimationCurve();
   new_curve->ApplyAdjustment(adjustment);
 
   std::unique_ptr<Animation> new_animation = Animation::Create(
@@ skipping 29 matching lines @@
     ElementId element_id) {
   if (scroll_offset_animation_player_->element_id() != element_id) {
     if (scroll_offset_animation_player_->element_id())
       scroll_offset_animation_player_->DetachElement();
     if (element_id)
       scroll_offset_animation_player_->AttachElement(element_id);
   }
 }
 
 }  // namespace cc