CC Animation: Use ElementId to attach CC animation players.

cc/test/animation_timelines_test_common.cc

Index: cc/test/animation_timelines_test_common.cc
diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc
index 491c996190a18bcbc86e0d21887b8a9591eb1262..e25562ccdf5a0f97797958d64e3d78460be69542 100644
--- a/cc/test/animation_timelines_test_common.cc
+++ b/cc/test/animation_timelines_test_common.cc
@@ -295,11 +295,11 @@ AnimationTimelinesTest::AnimationTimelinesTest()
       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() {
@@ -388,7 +388,7 @@ void AnimationTimelinesTest::AnimateLayersTransferEvents(
   host_->SetAnimationEvents(std::move(events));
 }
 
-AnimationPlayer* AnimationTimelinesTest::GetPlayerForLayerId(
+AnimationPlayer* AnimationTimelinesTest::GetPlayerForElementId(
     ElementId element_id) {
   const scoped_refptr<ElementAnimations> element_animations =
       host_->GetElementAnimationsForElementId(element_id);
@@ -396,7 +396,7 @@ AnimationPlayer* AnimationTimelinesTest::GetPlayerForLayerId(
                             : nullptr;
 }
 
-AnimationPlayer* AnimationTimelinesTest::GetImplPlayerForLayerId(
+AnimationPlayer* AnimationTimelinesTest::GetImplPlayerForElementId(
     ElementId element_id) {
   const scoped_refptr<ElementAnimations> element_animations =
       host_impl_->GetElementAnimationsForElementId(element_id);
@@ -404,9 +404,9 @@ AnimationPlayer* AnimationTimelinesTest::GetImplPlayerForLayerId(
                             : 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