CC Animations: Make LayerAnimationController creation optional

cc/layers/layer_unittest.cc

Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index bae8185053fe6a9123df9667313e584a4cce0bed..a216bfd205ec3c07fad75a250f420370a2b28361 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -1155,18 +1155,19 @@ static bool AddTestAnimation(Layer* layer) {
 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);