CC Animation: Start replacing int layer_id with ElementId element_id.

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 @@
     : 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) {
   host_ = client_.host();
   host_impl_ = client_impl_.host();
 
-  layer_id_ = NextTestLayerId();
+  element_id_ = NextTestLayerId();
 }
 
 AnimationTimelinesTest::~AnimationTimelinesTest() {
 }
 
 void AnimationTimelinesTest::SetUp() {
   timeline_ = AnimationTimeline::Create(timeline_id_);
   player_ = AnimationPlayer::Create(player_id_);
 }
 
 void AnimationTimelinesTest::TearDown() {
   host_impl_->ClearTimelines();
   host_->ClearTimelines();
 }
 
 void AnimationTimelinesTest::CreateTestLayer(
     bool needs_active_value_observations,
     bool needs_pending_value_observations) {
   CreateTestMainLayer();
 
   if (needs_pending_value_observations)
     CreateTestImplLayer(LayerTreeType::PENDING);
   if (needs_active_value_observations)
     CreateTestImplLayer(LayerTreeType::ACTIVE);
 }
 
 void AnimationTimelinesTest::CreateTestMainLayer() {
-  client_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
+  client_.RegisterLayer(element_id_, LayerTreeType::ACTIVE);
 }
 
 void AnimationTimelinesTest::CreateTestImplLayer(
     LayerTreeType layer_tree_type) {
-  client_impl_.RegisterLayer(layer_id_, layer_tree_type);
+  client_impl_.RegisterLayer(element_id_, layer_tree_type);
 }
 
 void AnimationTimelinesTest::AttachTimelinePlayerLayer() {
   host_->AddAnimationTimeline(timeline_);
   timeline_->AttachPlayer(player_);
-  player_->AttachLayer(layer_id_);
+  player_->AttachLayer(element_id_);
 }
 
 void AnimationTimelinesTest::CreateImplTimelineAndPlayer() {
   host_->PushPropertiesTo(host_impl_);
   GetImplTimelineAndPlayerByID();
 }
 
 scoped_refptr<ElementAnimations> AnimationTimelinesTest::element_animations()
     const {
   DCHECK(player_);
@@ skipping 49 matching lines @@
   return element_animations ? element_animations->players_list().head()->value()
                             : nullptr;
 }
 
 int AnimationTimelinesTest::NextTestLayerId() {
   next_test_layer_id_++;
   return next_test_layer_id_;
 }
 
 }  // namespace cc