CC Animation: Merge LayerAnimationController into ElementAnimations.

cc/animation/animation_player_unittest.cc

 // Copyright 2015 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/animation/animation_player.h"
 
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_timeline.h"
@@ skipping 188 matching lines @@
   const double duration = 1.;
 
   AddOpacityTransitionToPlayer(player1.get(), duration, start_opacity,
                                end_opacity, false);
   AddAnimatedTransformToPlayer(player2.get(), duration, transform_x,
                                transform_y);
 
   host_->PushPropertiesTo(host_impl_);
   host_impl_->ActivateAnimations();
 
-  EXPECT_FALSE(delegate1.started_);
-  EXPECT_FALSE(delegate1.finished_);
+  EXPECT_FALSE(delegate1.started());
+  EXPECT_FALSE(delegate1.finished());
 
-  EXPECT_FALSE(delegate2.started_);
-  EXPECT_FALSE(delegate2.finished_);
+  EXPECT_FALSE(delegate2.started());
+  EXPECT_FALSE(delegate2.finished());
 
   base::TimeTicks time;
   time += base::TimeDelta::FromSecondsD(0.1);
   AnimateLayersTransferEvents(time, 2u);
 
-  EXPECT_TRUE(delegate1.started_);
-  EXPECT_FALSE(delegate1.finished_);
+  EXPECT_TRUE(delegate1.started());
+  EXPECT_FALSE(delegate1.finished());
 
-  EXPECT_TRUE(delegate2.started_);
-  EXPECT_FALSE(delegate2.finished_);
+  EXPECT_TRUE(delegate2.started());
+  EXPECT_FALSE(delegate2.finished());
 
   time += base::TimeDelta::FromSecondsD(duration);
   AnimateLayersTransferEvents(time, 2u);
 
-  EXPECT_TRUE(delegate1.finished_);
-  EXPECT_TRUE(delegate2.finished_);
+  EXPECT_TRUE(delegate1.finished());
+  EXPECT_TRUE(delegate2.finished());
 
   client_.ExpectOpacityPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                        end_opacity);
   client_.ExpectTransformPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                          transform_x, transform_y);
 
   client_impl_.ExpectOpacityPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                             end_opacity);
   client_impl_.ExpectTransformPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                               transform_x, transform_y);
@@ skipping 118 matching lines @@
 
   host_->PushPropertiesTo(host_impl_);
 
   EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(new_layer_id));
   EXPECT_TRUE(player_impl_->element_animations());
   EXPECT_EQ(player_impl_->layer_id(), new_layer_id);
 }
 
 }  // namespace
 }  // namespace cc