CC Animation: Use ElementId to attach CC animation players.

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 277 matching lines @@
   takeover_ = true;
 }
 
 AnimationTimelinesTest::AnimationTimelinesTest()
     : client_(ThreadInstance::MAIN),
       client_impl_(ThreadInstance::IMPL),
       host_(nullptr),
       host_impl_(nullptr),
       timeline_id_(AnimationIdProvider::NextTimelineId()),
       player_id_(AnimationIdProvider::NextPlayerId()),
-      next_test_layer_id_(0) {
+      next_test_element_id_(0) {
   host_ = client_.host();
   host_impl_ = client_impl_.host();
 
-  element_id_ = NextTestLayerId();
+  element_id_ = NextTestElementId();
 }
 
 AnimationTimelinesTest::~AnimationTimelinesTest() {
 }
 
 void AnimationTimelinesTest::SetUp() {
   timeline_ = AnimationTimeline::Create(timeline_id_);
   player_ = AnimationPlayer::Create(player_id_);
 }
 
@@ skipping 68 matching lines @@
 
   host_impl_->AnimateLayers(time);
   host_impl_->UpdateAnimationState(true, events.get());
   EXPECT_EQ(expect_events, events->events_.size());
 
   host_->AnimateLayers(time);
   host_->UpdateAnimationState(true, nullptr);
   host_->SetAnimationEvents(std::move(events));
 }
 
-AnimationPlayer* AnimationTimelinesTest::GetPlayerForLayerId(
+AnimationPlayer* AnimationTimelinesTest::GetPlayerForElementId(
     ElementId element_id) {
   const scoped_refptr<ElementAnimations> element_animations =
       host_->GetElementAnimationsForElementId(element_id);
   return element_animations ? element_animations->players_list().head()->value()
                             : nullptr;
 }
 
-AnimationPlayer* AnimationTimelinesTest::GetImplPlayerForLayerId(
+AnimationPlayer* AnimationTimelinesTest::GetImplPlayerForElementId(
     ElementId element_id) {
   const scoped_refptr<ElementAnimations> element_animations =
       host_impl_->GetElementAnimationsForElementId(element_id);
   return element_animations ? element_animations->players_list().head()->value()
                             : nullptr;
 }
 
-int AnimationTimelinesTest::NextTestLayerId() {
-  next_test_layer_id_++;
-  return next_test_layer_id_;
+ElementId AnimationTimelinesTest::NextTestElementId() {
+  next_test_element_id_++;
+  return next_test_element_id_;
 }
 
 }  // namespace cc