Revert of Use element id's for animations

cc/animation/animation_player_unittest.cc

Index: cc/animation/animation_player_unittest.cc
diff --git a/cc/animation/animation_player_unittest.cc b/cc/animation/animation_player_unittest.cc
index 41acac4a01f0cc220802e548ca356a9c3d328d09..14de5aadfeaa6af275aa5b66371c68c38da04678 100644
--- a/cc/animation/animation_player_unittest.cc
+++ b/cc/animation/animation_player_unittest.cc
@@ -39,7 +39,7 @@
   EXPECT_FALSE(player_impl_->element_id());
 
   player_->AttachElement(element_id_);
-  EXPECT_EQ(player_, GetPlayerForElementId(element_id_));
+  EXPECT_EQ(player_, GetPlayerForLayerId(element_id_));
   EXPECT_TRUE(player_->element_animations());
   EXPECT_EQ(player_->element_id(), element_id_);
 
@@ -50,7 +50,7 @@
   EXPECT_EQ(player_impl_->element_id(), element_id_);
 
   player_->DetachElement();
-  EXPECT_FALSE(GetPlayerForElementId(element_id_));
+  EXPECT_FALSE(GetPlayerForLayerId(element_id_));
   EXPECT_FALSE(player_->element_animations());
   EXPECT_FALSE(player_->element_id());
 
@@ -74,20 +74,20 @@
 
   player_->AttachElement(element_id_);
   EXPECT_FALSE(player_->animation_timeline());
-  EXPECT_FALSE(GetPlayerForElementId(element_id_));
+  EXPECT_FALSE(GetPlayerForLayerId(element_id_));
   EXPECT_FALSE(player_->element_animations());
   EXPECT_EQ(player_->element_id(), element_id_);
 
   timeline_->AttachPlayer(player_);
   EXPECT_EQ(timeline_, player_->animation_timeline());
-  EXPECT_EQ(player_, GetPlayerForElementId(element_id_));
+  EXPECT_EQ(player_, GetPlayerForLayerId(element_id_));
   EXPECT_TRUE(player_->element_animations());
   EXPECT_EQ(player_->element_id(), element_id_);
 
   // Removing player from timeline detaches layer.
   timeline_->DetachPlayer(player_);
   EXPECT_FALSE(player_->animation_timeline());
-  EXPECT_FALSE(GetPlayerForElementId(element_id_));
+  EXPECT_FALSE(GetPlayerForLayerId(element_id_));
   EXPECT_FALSE(player_->element_animations());
   EXPECT_FALSE(player_->element_id());
 }
@@ -340,7 +340,7 @@
 
   GetImplTimelineAndPlayerByID();
 
-  EXPECT_EQ(player_, GetPlayerForElementId(element_id_));
+  EXPECT_EQ(player_, GetPlayerForLayerId(element_id_));
   EXPECT_TRUE(player_->element_animations());
   EXPECT_EQ(player_->element_id(), element_id_);
 
@@ -348,19 +348,19 @@
   EXPECT_TRUE(player_impl_->element_animations());
   EXPECT_EQ(player_impl_->element_id(), element_id_);
 
-  const ElementId new_element_id(NextTestLayerId(), 0);
+  const int new_layer_id = NextTestLayerId();
   player_->DetachElement();
-  player_->AttachElement(new_element_id);
-
-  EXPECT_EQ(player_, GetPlayerForElementId(new_element_id));
-  EXPECT_TRUE(player_->element_animations());
-  EXPECT_EQ(player_->element_id(), new_element_id);
-
-  host_->PushPropertiesTo(host_impl_);
-
-  EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(new_element_id));
+  player_->AttachElement(new_layer_id);
+
+  EXPECT_EQ(player_, GetPlayerForLayerId(new_layer_id));
+  EXPECT_TRUE(player_->element_animations());
+  EXPECT_EQ(player_->element_id(), new_layer_id);
+
+  host_->PushPropertiesTo(host_impl_);
+
+  EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(new_layer_id));
   EXPECT_TRUE(player_impl_->element_animations());
-  EXPECT_EQ(player_impl_->element_id(), new_element_id);
+  EXPECT_EQ(player_impl_->element_id(), new_layer_id);
 }
 
 }  // namespace