Use an auxiliary list of animation controllers.

cc/test/animation_test_common.cc

Index: cc/test/animation_test_common.cc
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index fd6ba2dd7e797f0ac8fdd3542bcaf44a083afd49..73e0960cc20ef71755f1abcf1816b3ac589e8b87 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -150,40 +150,6 @@ float FakeFloatTransition::getValue(double time) const
     return (1 - time) * m_from + time * m_to;
 }
 
-FakeLayerAnimationControllerClient::FakeLayerAnimationControllerClient()
-    : m_opacity(0)
-{
-}
-
-FakeLayerAnimationControllerClient::~FakeLayerAnimationControllerClient()
-{
-}
-
-int FakeLayerAnimationControllerClient::id() const
-{
-    return 0;
-}
-
-void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity)
-{
-    m_opacity = opacity;
-}
-
-float FakeLayerAnimationControllerClient::opacity() const
-{
-    return m_opacity;
-}
-
-void FakeLayerAnimationControllerClient::setTransformFromAnimation(const gfx::Transform& transform)
-{
-    m_transform = transform;
-}
-
-const gfx::Transform& FakeLayerAnimationControllerClient::transform() const
-{
-    return m_transform;
-}
-
 scoped_ptr<cc::AnimationCurve> FakeFloatTransition::clone() const
 {
     return make_scoped_ptr(new FakeFloatTransition(*this)).PassAs<cc::AnimationCurve>();