CC Animation: Erase AnimationRegistrar

cc/animation/layer_animation_controller_unittest.cc

 // Copyright 2012 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/layer_animation_controller.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation.h"
@@ skipping 214 matching lines @@
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   std::unique_ptr<AnimationEvents> events = host->CreateEvents();
 
-  host->SetAnimationRegistrarFor(controller);
-  host_impl->SetAnimationRegistrarFor(controller_impl);
+  controller->SetAnimationHost(host.get());
+  controller_impl->SetAnimationHost(host_impl.get());
   EXPECT_EQ(1u, host->all_animation_controllers_for_testing().size());
   EXPECT_EQ(1u, host_impl->all_animation_controllers_for_testing().size());
 
   // Initially, both controllers should be inactive.
   EXPECT_EQ(0u, host->active_animation_controllers_for_testing().size());
   EXPECT_EQ(0u, host_impl->active_animation_controllers_for_testing().size());
 
   AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
   // The main thread controller should now be active.
   EXPECT_EQ(1u, host->active_animation_controllers_for_testing().size());
@@ skipping 43 matching lines @@
   // The main thread controller should have de-activated.
   EXPECT_EQ(0u, host->active_animation_controllers_for_testing().size());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_FALSE(controller->has_any_animation());
   EXPECT_FALSE(controller_impl->has_any_animation());
   EXPECT_EQ(0u, host->active_animation_controllers_for_testing().size());
   EXPECT_EQ(0u, host_impl->active_animation_controllers_for_testing().size());
 
-  host->ResetAnimationRegistrarFor(controller);
-  host_impl->ResetAnimationRegistrarFor(controller_impl);
+  controller->SetAnimationHost(nullptr);
+  controller_impl->SetAnimationHost(nullptr);
 }
 
 TEST(LayerAnimationControllerTest, SyncPause) {
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
@@ skipping 2809 matching lines @@
       TargetProperty::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
       TargetProperty::OPACITY,
       LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
       TargetProperty::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
 }
 
 }  // namespace
 }  // namespace cc