Blink CompositorAnimations: Add more tests for integration with CC.

third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h

Index: third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h
diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h
index 687fa04ed948ab29c0e8d98aa555cbcd84ebf3e5..91105550891d3662e8a06add7016f7075057f0f7 100644
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h
@@ -25,11 +25,14 @@
 #ifndef CompositorAnimationsTestHelper_h
 #define CompositorAnimationsTestHelper_h
 
+#include "core/animation/AnimationTranslationUtilTest.h"
 #include "core/animation/CompositorAnimations.h"
 #include "platform/testing/TestingPlatformSupport.h"
+#include "platform/testing/WebLayerMock.h"
 #include "public/platform/WebCompositorAnimationPlayer.h"
 #include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
+#include "public/platform/WebContentLayer.h"
 #include "public/platform/WebFloatAnimationCurve.h"
 #include "public/platform/WebFloatKeyframe.h"
 #include "wtf/PassOwnPtr.h"
@@ -132,6 +135,21 @@ public:
     MOCK_METHOD1(addAnimation, void(WebCompositorAnimation*));
     MOCK_METHOD1(removeAnimation, void(int));
     MOCK_METHOD2(pauseAnimation, void(int, double));
+    MOCK_METHOD1(abortAnimation, void(int));
+};
+
+class WebContentLayerMock : public WebContentLayer {
+public:
+    WebContentLayerMock()
+        : m_layer(adoptPtrWillBeNoop(new WebLayerMock))
+    {
+    }
+    virtual ~WebContentLayerMock() {}
+    WebLayer* layer() override
+    {
+        return m_layer.get();
+    }
+    OwnPtr<WebLayerMock> m_layer;
 };
 
 } // namespace blink
@@ -149,6 +167,16 @@ public:
 
         MOCK_METHOD0(createAnimationPlayer, WebCompositorAnimationPlayer*());
         MOCK_METHOD0(createAnimationTimeline, WebCompositorAnimationTimeline*());
+
+        WebContentLayer* createContentLayer(WebContentLayerClient*) override
+        {
+            return new WebContentLayerMock();
+        }
+
+        WebFilterOperations* createFilterOperations() override
+        {
+            return new WebFilterOperationsMock();
+        }
     };
 
 private: