Revert 171714 - Use an auxiliary list of animation controllers.

cc/tree_synchronizer_unittest.cc

 // Copyright 2011 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/tree_synchronizer.h"
 
 #include <algorithm>
 
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
@@ skipping 57 matching lines @@
         , m_layerImplDestructionList(layerImplDestructionList)
     {
     }
     virtual ~MockLayer() { }
 
     std::vector<int>* m_layerImplDestructionList;
 };
 
 class FakeLayerAnimationController : public LayerAnimationController {
 public:
-    static scoped_refptr<LayerAnimationController> create()
+    static scoped_ptr<FakeLayerAnimationController> create(LayerAnimationControllerClient* client)
     {
-        return static_cast<LayerAnimationController*>(new FakeLayerAnimationController);
+        return make_scoped_ptr(new FakeLayerAnimationController(client));
     }
 
     bool synchronizedAnimations() const { return m_synchronizedAnimations; }
 
 private:
-    FakeLayerAnimationController()
-        : LayerAnimationController()
+    explicit FakeLayerAnimationController(LayerAnimationControllerClient* client)
+        : LayerAnimationController(client)
         , m_synchronizedAnimations(false)
-    { }
-
-    virtual ~FakeLayerAnimationController() { }
+    {
+    }
 
     virtual void pushAnimationUpdatesTo(LayerAnimationController* controllerImpl)
     {
         LayerAnimationController::pushAnimationUpdatesTo(controllerImpl);
         m_synchronizedAnimations = true;
     }
 
     bool m_synchronizedAnimations;
 };
 
@@ skipping 284 matching lines @@
 
 TEST(TreeSynchronizerTest, synchronizeAnimations)
 {
     LayerTreeSettings settings;
     FakeProxy proxy(scoped_ptr<Thread>(NULL));
     DebugScopedSetImplThread impl(&proxy);
     scoped_ptr<LayerTreeHostImpl> hostImpl = LayerTreeHostImpl::create(settings, 0, &proxy);
 
     scoped_refptr<Layer> layerTreeRoot = Layer::create();
 
-    layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create());
+    FakeLayerAnimationControllerClient dummy;
+    layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy).PassAs<LayerAnimationController>());
 
     EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations());
 
     scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.get());
     layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), layerImplTreeRoot.Pass(), hostImpl.get());
 
     EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations());
 }
 
 }  // namespace
 }  // namespace cc