CC Animations: Make LayerAnimationController creation optional

cc/layers/layer_unittest.cc

 // Copyright 2011 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/layers/layer.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 1137 matching lines @@
       FloatKeyframe::Create(base::TimeDelta::FromSecondsD(1.0), 0.7f, nullptr));
   scoped_ptr<Animation> animation =
       Animation::Create(curve.Pass(), 0, 0, Animation::OPACITY);
 
   return layer->AddAnimation(animation.Pass());
 }
 
 TEST(LayerLayerTreeHostTest, ShouldNotAddAnimationWithoutAnimationRegistrar) {
   scoped_refptr<Layer> layer = Layer::Create();
 
+  LayerTreeSettings settings;
+  settings.accelerated_animation_enabled = false;
+
   // Case 1: without a LayerTreeHost and without an AnimationRegistrar, the
   // animation should not be accepted.
   EXPECT_FALSE(AddTestAnimation(layer.get()));
 
   scoped_ptr<AnimationRegistrar> registrar = AnimationRegistrar::Create();
-  layer->layer_animation_controller()->SetAnimationRegistrar(registrar.get());
+  layer->RegisterForAnimations(registrar.get(), settings);
 
   // Case 2: with an AnimationRegistrar, the animation should be accepted.
   EXPECT_TRUE(AddTestAnimation(layer.get()));
 
-  LayerTreeSettings settings;
-  settings.accelerated_animation_enabled = false;
   LayerTreeHostFactory factory;
   scoped_ptr<LayerTreeHost> layer_tree_host = factory.Create(settings);
   layer_tree_host->SetRootLayer(layer);
   AssertLayerTreeHostMatchesForSubtree(layer.get(), layer_tree_host.get());
 
   // Case 3: with a LayerTreeHost where accelerated animation is disabled, the
   // animation should be rejected.
   EXPECT_FALSE(AddTestAnimation(layer.get()));
 }
 
@@ skipping 136 matching lines @@
   // When the layer is destroyed, the other three requests should be aborted.
   layer = nullptr;
   EXPECT_EQ(1, did_receive_first_result_from_this_source);
   EXPECT_EQ(1, did_receive_result_from_different_source);
   EXPECT_EQ(1, did_receive_result_from_anonymous_source);
   EXPECT_EQ(1, did_receive_second_result_from_this_source);
 }
 
 }  // namespace
 }  // namespace cc