CC Animation: Use ElementId to attach CC animation players.

cc/test/layer_test_common.h

Index: cc/test/layer_test_common.h
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index 7c1a60085f2e0d27f7521c067de2fb28813e8d79..8f7933d9fa630fbb3e8d0b260dec2ef85ce40daa 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -13,6 +13,7 @@
 #include "cc/animation/animation_timeline.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/fake_layer_tree_host.h"
+#include "cc/test/test_element_id.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_impl.h"
 
@@ -60,6 +61,7 @@ class LayerTestCommon {
     T* AddChildToRoot() {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       root_layer()->AddChild(std::move(layer));
       return ptr;
@@ -69,6 +71,7 @@ class LayerTestCommon {
     T* AddChild(LayerImpl* parent) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       parent->AddChild(std::move(layer));
       return ptr;
@@ -78,6 +81,7 @@ class LayerTestCommon {
     T* AddReplicaLayer(LayerImpl* origin) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       origin->SetReplicaLayer(std::move(layer));
       return ptr;
@@ -87,6 +91,7 @@ class LayerTestCommon {
     T* AddChildToRoot(const A& a) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       root_layer()->AddChild(std::move(layer));
       return ptr;
@@ -96,6 +101,7 @@ class LayerTestCommon {
     T* AddChildToRoot(const A& a, const B& b) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a, b);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       root_layer()->AddChild(std::move(layer));
       return ptr;
@@ -105,6 +111,7 @@ class LayerTestCommon {
     T* AddChildToRoot(const A& a, const B& b, const C& c, const D& d) {
       std::unique_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
                                            layer_impl_id_++, a, b, c, d);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       root_layer()->AddChild(std::move(layer));
       return ptr;
@@ -123,6 +130,7 @@ class LayerTestCommon {
                       const E& e) {
       std::unique_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
                                            layer_impl_id_++, a, b, c, d, e);
+      layer->SetElementId(NextTestElementId());
       T* ptr = layer.get();
       root_layer()->AddChild(std::move(layer));
       return ptr;