CC Animation: Merge LayerAnimationController into ElementAnimations.

cc/trees/layer_tree_host_common_unittest.cc

Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index bb3b18dec062a87b04a17fdf4f6bfad0a346f4bb..1342a142b5a935c910f8f6dea930a5da46da1eda 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -15,8 +15,8 @@
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
+#include "cc/animation/element_animations.h"
 #include "cc/animation/keyframed_animation_curve.h"
-#include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/base/math_util.h"
 #include "cc/input/main_thread_scrolling_reason.h"
@@ -8887,7 +8887,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingLayerImpl) {
       root_ptr->id(), player.get());
   host_impl.active_tree()
       ->animation_host()
-      ->GetControllerForLayerId(root_ptr->id())
+      ->GetElementAnimationsForLayerId(root_ptr->id())
       ->AddAnimation(std::move(transform_animation));
   grandchild_ptr->set_visible_layer_rect(gfx::Rect());
   child_ptr->SetScrollClipLayer(root_ptr->id());
@@ -8943,7 +8943,7 @@ TEST_F(LayerTreeHostCommonTest, LayerSkippingInSubtreeOfSingularTransform) {
   host_impl()
       ->active_tree()
       ->animation_host()
-      ->GetControllerForLayerId(grand_child->id())
+      ->GetElementAnimationsForLayerId(grand_child->id())
       ->AddAnimation(std::move(transform_animation));
 
   ExecuteCalculateDrawProperties(root);
@@ -9013,7 +9013,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingPendingLayerImpl) {
       root_ptr->id(), player.get());
   host_impl.active_tree()
       ->animation_host()
-      ->GetControllerForLayerId(root_ptr->id())
+      ->GetElementAnimationsForLayerId(root_ptr->id())
       ->AddAnimation(std::move(animation));
   root_ptr->SetOpacity(0);
   grandchild_ptr->set_visible_layer_rect(gfx::Rect());