CC Animations: Rewrite unit tests to work with AnimationPlayer.

cc/test/animation_timelines_test_common.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/test/animation_timelines_test_common.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
@@ skipping 377 matching lines @@
 
 void AnimationTimelinesTest::CreateTestImplLayer(
     ElementListType element_list_type) {
   client_impl_.RegisterElement(element_id_, element_list_type);
 }
 
 void AnimationTimelinesTest::AttachTimelinePlayerLayer() {
   host_->AddAnimationTimeline(timeline_);
   timeline_->AttachPlayer(player_);
   player_->AttachElement(element_id_);
+
+  element_animations_ = player_->element_animations();
 }
 
 void AnimationTimelinesTest::CreateImplTimelineAndPlayer() {
   host_->PushPropertiesTo(host_impl_);
   GetImplTimelineAndPlayerByID();
 }
 
-scoped_refptr<ElementAnimations> AnimationTimelinesTest::element_animations()
-    const {
-  DCHECK(player_);
-  DCHECK(player_->element_animations());
-  return player_->element_animations();
-}
-
-scoped_refptr<ElementAnimations>
-AnimationTimelinesTest::element_animations_impl() const {
-  DCHECK(player_impl_);
-  DCHECK(player_impl_->element_animations());
-  return player_impl_->element_animations();
-}
-
 void AnimationTimelinesTest::GetImplTimelineAndPlayerByID() {
   timeline_impl_ = host_impl_->GetTimelineById(timeline_id_);
   EXPECT_TRUE(timeline_impl_);
   player_impl_ = timeline_impl_->GetPlayerById(player_id_);
   EXPECT_TRUE(player_impl_);
+
+  element_animations_impl_ = player_impl_->element_animations();
 }
 
 void AnimationTimelinesTest::ReleaseRefPtrs() {
   player_ = nullptr;
   timeline_ = nullptr;
   player_impl_ = nullptr;
   timeline_impl_ = nullptr;
 }
 
 void AnimationTimelinesTest::AnimateLayersTransferEvents(
@@ skipping 64 matching lines @@
   }
 
   return result;
 }
 
 void AnimationTimelinesTest::PushProperties() {
   host_->PushPropertiesTo(host_impl_);
 }
 
 }  // namespace cc