CC Animation: Make AnimationRegistrar a private member of AnimationHost.

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_registrar.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/animation/element_animations.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/animation_timelines_test_common.h"
 
 namespace cc {
 namespace {
 
 class AnimationPlayerTest : public AnimationTimelinesTest {
  public:
@@ skipping 108 matching lines @@
   EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                          TargetProperty::FILTER));
 
   EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                               TargetProperty::OPACITY));
   EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                               TargetProperty::TRANSFORM));
   EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                               TargetProperty::FILTER));
 
-  host_impl_->animation_registrar()->ActivateAnimations();
+  host_impl_->ActivateAnimations();
 
   base::TimeTicks time;
   time += base::TimeDelta::FromSecondsD(0.1);
   AnimateLayersTransferEvents(time, 3u);
 
   time += base::TimeDelta::FromSecondsD(duration);
   AnimateLayersTransferEvents(time, 3u);
 
   client_.ExpectOpacityPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                        end_opacity);
@@ skipping 48 matching lines @@
   const int transform_y = 20;
 
   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_->animation_registrar()->ActivateAnimations();
+  host_impl_->ActivateAnimations();
 
   EXPECT_FALSE(delegate1.started_);
   EXPECT_FALSE(delegate1.finished_);
 
   EXPECT_FALSE(delegate2.started_);
   EXPECT_FALSE(delegate2.finished_);
 
   base::TimeTicks time;
   time += base::TimeDelta::FromSecondsD(0.1);
   AnimateLayersTransferEvents(time, 2u);
@@ skipping 61 matching lines @@
   EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                          TargetProperty::OPACITY));
   EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                               TargetProperty::OPACITY));
 
   EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                          TargetProperty::FILTER));
   EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                               TargetProperty::FILTER));
 
-  host_impl_->animation_registrar()->ActivateAnimations();
+  host_impl_->ActivateAnimations();
 
   base::TimeTicks time;
   time += base::TimeDelta::FromSecondsD(0.1);
   AnimateLayersTransferEvents(time, 1u);
 
   time += base::TimeDelta::FromSecondsD(duration);
   AnimateLayersTransferEvents(time, 1u);
 
   client_.ExpectOpacityPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
                                        end_opacity);
@@ skipping 60 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