CC Animation: Use ElementId to attach CC animation players.

cc/test/layer_test_common.h

 // Copyright 2012 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.
 
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #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"
 
 #define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test)                 \
   do {                                                                \
     EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times((expect)); \
     code_to_test;                                                     \
     Mock::VerifyAndClearExpectations(layer_tree_host_.get());         \
   } while (false)
 
@@ skipping 27 matching lines @@
   class LayerImplTest {
    public:
     LayerImplTest();
     explicit LayerImplTest(const LayerTreeSettings& settings);
     ~LayerImplTest();
 
     template <typename T>
     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;
     }
 
     template <typename T>
     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;
     }
 
     template <typename T>
     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;
     }
 
     template <typename T, typename A>
     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;
     }
 
     template <typename T, typename A, typename B>
     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;
     }
 
     template <typename T, typename A, typename B, typename C, typename D>
     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;
     }
 
     template <typename T,
               typename A,
               typename B,
               typename C,
               typename D,
               typename E>
     T* AddChildToRoot(const A& a,
                       const B& b,
                       const C& c,
                       const D& d,
                       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;
     }
 
     void CalcDrawProps(const gfx::Size& viewport_size);
     void AppendQuadsWithOcclusion(LayerImpl* layer_impl,
                                   const gfx::Rect& occluded);
     void AppendQuadsForPassWithOcclusion(LayerImpl* layer_impl,
                                          RenderPass* given_render_pass,
@@ skipping 33 matching lines @@
     std::unique_ptr<RenderPass> render_pass_;
     scoped_refptr<AnimationTimeline> timeline_;
     scoped_refptr<AnimationTimeline> timeline_impl_;
     int layer_impl_id_;
   };
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TEST_COMMON_H_