Revert 171714 - Use an auxiliary list of animation controllers.

cc/test/layer_tree_test_common.cc

Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index dd40f136ba16c8fb8bf212b778303d2b9a83b4e4..bfa15dd91d64ca0269a67b582a8a5b104be35942 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -156,6 +156,12 @@ public:
         return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, proxy()).PassAs<cc::LayerTreeHostImpl>();
     }
 
+    virtual void didAddAnimation() OVERRIDE
+    {
+        LayerTreeHost::didAddAnimation();
+        m_testHooks->didAddAnimation();
+    }
+
     virtual void setNeedsCommit() OVERRIDE
     {
         if (!m_testStarted)
@@ -163,12 +169,6 @@ public:
         LayerTreeHost::setNeedsCommit();
     }
 
-    virtual void DidActivateAnimationController(cc::LayerAnimationController* controller) OVERRIDE
-    {
-        LayerTreeHost::DidActivateAnimationController(controller);
-        m_testHooks->didAddAnimation();
-    }
-
     void setTestStarted(bool started) { m_testStarted = started; }
 
     virtual void didDeferCommit() OVERRIDE
@@ -335,6 +335,11 @@ void ThreadedTest::postSetVisibleToMainThread(bool visible)
     m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetVisible, base::Unretained(this), visible));
 }
 
+void ThreadedTest::postDidAddAnimationToMainThread()
+{
+    m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchDidAddAnimation, base::Unretained(this)));
+}
+
 void ThreadedTest::doBeginTest()
 {
     m_client = ThreadedMockLayerTreeHostClient::create(this);
@@ -464,6 +469,17 @@ void ThreadedTest::dispatchComposite()
         m_layerTreeHost->composite();
 }
 
+void ThreadedTest::dispatchDidAddAnimation()
+{
+    DCHECK(!proxy() || proxy()->isMainThread());
+
+    if (m_finished)
+        return;
+
+    if (m_layerTreeHost.get())
+        m_layerTreeHost->didAddAnimation();
+}
+
 void ThreadedTest::runTest(bool threaded)
 {
     if (threaded) {