Revert of Use element id's for animations

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 162 matching lines @@
   scroll_offset_ = scroll_offset;
 }
 
 gfx::ScrollOffset TestHostClient::GetScrollOffsetForAnimation(
     ElementId element_id) const {
   return scroll_offset_;
 }
 
 void TestHostClient::RegisterElement(ElementId element_id,
                                      ElementListType list_type) {
-  ElementIdToTestLayer& layers_in_tree = list_type == ElementListType::ACTIVE
-                                             ? layers_in_active_tree_
-                                             : layers_in_pending_tree_;
+  LayerIdToTestLayer& layers_in_tree = list_type == ElementListType::ACTIVE
+                                           ? layers_in_active_tree_
+                                           : layers_in_pending_tree_;
   DCHECK(layers_in_tree.find(element_id) == layers_in_tree.end());
   layers_in_tree[element_id] = TestLayer::Create();
 
   DCHECK(host_);
   host_->RegisterElement(element_id, list_type);
 }
 
 void TestHostClient::UnregisterElement(ElementId element_id,
                                        ElementListType list_type) {
   DCHECK(host_);
   host_->UnregisterElement(element_id, list_type);
 
-  ElementIdToTestLayer& layers_in_tree = list_type == ElementListType::ACTIVE
-                                             ? layers_in_active_tree_
-                                             : layers_in_pending_tree_;
+  LayerIdToTestLayer& layers_in_tree = list_type == ElementListType::ACTIVE
+                                           ? layers_in_active_tree_
+                                           : layers_in_pending_tree_;
   auto kv = layers_in_tree.find(element_id);
   DCHECK(kv != layers_in_tree.end());
   layers_in_tree.erase(kv);
 }
 
 bool TestHostClient::IsPropertyMutated(ElementId element_id,
                                        ElementListType list_type,
                                        TargetProperty::Type property) const {
   TestLayer* layer = FindTestLayer(element_id, list_type);
   EXPECT_TRUE(layer);
@@ skipping 85 matching lines @@
                                                     int transform_y) const {
   TestLayer* layer = FindTestLayer(element_id, list_type);
   EXPECT_TRUE(layer);
   EXPECT_TRUE(layer->is_property_mutated(TargetProperty::TRANSFORM));
   EXPECT_EQ(transform_x, layer->transform_x());
   EXPECT_EQ(transform_y, layer->transform_y());
 }
 
 TestLayer* TestHostClient::FindTestLayer(ElementId element_id,
                                          ElementListType list_type) const {
-  const ElementIdToTestLayer& layers_in_tree =
+  const LayerIdToTestLayer& layers_in_tree =
       list_type == ElementListType::ACTIVE ? layers_in_active_tree_
                                            : layers_in_pending_tree_;
   auto kv = layers_in_tree.find(element_id);
   if (kv == layers_in_tree.end())
     return nullptr;
 
   DCHECK(kv->second);
   return kv->second.get();
 }
 
@@ skipping 38 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();
 
-  element_id_ = ElementId(NextTestLayerId(), 0);
+  element_id_ = NextTestLayerId();
 }
 
 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::GetPlayerForElementId(
+AnimationPlayer* AnimationTimelinesTest::GetPlayerForLayerId(
     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(
     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_;
 }
 
 }  // namespace cc