CC Animation: Make AnimationRegistrar a private member of AnimationHost.

cc/test/animation_timelines_test_common.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/test/animation_timelines_test_common.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
-#include "cc/animation/animation_registrar.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/animation/element_animations.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 std::unique_ptr<TestLayer> TestLayer::Create() {
   return base::WrapUnique(new TestLayer());
@@ skipping 206 matching lines @@
 void AnimationTimelinesTest::ReleaseRefPtrs() {
   player_ = nullptr;
   timeline_ = nullptr;
   player_impl_ = nullptr;
   timeline_impl_ = nullptr;
 }
 
 void AnimationTimelinesTest::AnimateLayersTransferEvents(
     base::TimeTicks time,
     unsigned expect_events) {
-  std::unique_ptr<AnimationEvents> events =
-      host_->animation_registrar()->CreateEvents();
+  std::unique_ptr<AnimationEvents> events = host_->CreateEvents();
 
-  host_impl_->animation_registrar()->AnimateLayers(time);
-  host_impl_->animation_registrar()->UpdateAnimationState(true, events.get());
+  host_impl_->AnimateLayers(time);
+  host_impl_->UpdateAnimationState(true, events.get());
   EXPECT_EQ(expect_events, events->events_.size());
 
-  host_->animation_registrar()->AnimateLayers(time);
-  host_->animation_registrar()->UpdateAnimationState(true, nullptr);
-  host_->animation_registrar()->SetAnimationEvents(std::move(events));
+  host_->AnimateLayers(time);
+  host_->UpdateAnimationState(true, nullptr);
+  host_->SetAnimationEvents(std::move(events));
 }
 
 AnimationPlayer* AnimationTimelinesTest::GetPlayerForLayerId(int layer_id) {
   const ElementAnimations* element_animations =
       host_->GetElementAnimationsForLayerId(layer_id);
   return element_animations ? element_animations->players_list().head()->value()
                             : nullptr;
 }
 
 AnimationPlayer* AnimationTimelinesTest::GetImplPlayerForLayerId(int layer_id) {
   const ElementAnimations* element_animations =
       host_impl_->GetElementAnimationsForLayerId(layer_id);
   return element_animations ? element_animations->players_list().head()->value()
                             : nullptr;
 }
 
 int AnimationTimelinesTest::NextTestLayerId() {
   next_test_layer_id_++;
   return next_test_layer_id_;
 }
 
 }  // namespace cc