CC Animation: Make LayerAnimationController to have just one value observer.

cc/trees/layer_tree_host_unittest_animation.cc

Index: cc/trees/layer_tree_host_unittest_animation.cc
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index 30715fbf58c786d5937c438904ba9c17d1f4bdc4..9547562a00eff715f0487896afeaa37be990da0f 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -1069,26 +1069,26 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 0:
-        EXPECT_TRUE(player_->element_animations()
-                        ->has_active_value_observer_for_testing());
-        EXPECT_FALSE(player_->element_animations()
-                         ->has_pending_value_observer_for_testing());
+        EXPECT_TRUE(
+            player_->element_animations()->needs_active_value_observations());
+        EXPECT_FALSE(
+            player_->element_animations()->needs_pending_value_observations());
         EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
         break;
       case 1:
         layer_->RemoveFromParent();
-        EXPECT_FALSE(player_->element_animations()
-                         ->has_active_value_observer_for_testing());
-        EXPECT_FALSE(player_->element_animations()
-                         ->has_pending_value_observer_for_testing());
+        EXPECT_FALSE(
+            player_->element_animations()->needs_active_value_observations());
+        EXPECT_FALSE(
+            player_->element_animations()->needs_pending_value_observations());
         EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
         break;
       case 2:
         layer_tree_host()->root_layer()->AddChild(layer_);
-        EXPECT_TRUE(player_->element_animations()
-                        ->has_active_value_observer_for_testing());
-        EXPECT_FALSE(player_->element_animations()
-                         ->has_pending_value_observer_for_testing());
+        EXPECT_TRUE(
+            player_->element_animations()->needs_active_value_observations());
+        EXPECT_FALSE(
+            player_->element_animations()->needs_pending_value_observations());
         EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
         break;
     }
@@ -1103,17 +1103,17 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded
     switch (host_impl->active_tree()->source_frame_number()) {
       case 0:
         EXPECT_TRUE(player_impl->element_animations()
-                        ->has_active_value_observer_for_testing());
+                        ->needs_active_value_observations());
         EXPECT_TRUE(host_impl->animation_host()->NeedsAnimateLayers());
         break;
       case 1:
         EXPECT_FALSE(player_impl->element_animations()
-                         ->has_active_value_observer_for_testing());
+                         ->needs_active_value_observations());
         EXPECT_TRUE(host_impl->animation_host()->NeedsAnimateLayers());
         break;
       case 2:
         EXPECT_TRUE(player_impl->element_animations()
-                        ->has_active_value_observer_for_testing());
+                        ->needs_active_value_observations());
         EXPECT_TRUE(host_impl->animation_host()->NeedsAnimateLayers());
         EndTest();
         break;