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..43d550c66993c7ff63588823075dec985cd107b4 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,25 +135,48 @@ public:
     MOCK_METHOD1(addAnimation, void(WebCompositorAnimation*));
     MOCK_METHOD1(removeAnimation, void(int));
     MOCK_METHOD2(pauseAnimation, void(int, double));
+    MOCK_METHOD1(abortAnimation, void(int));
 };
 
-} // namespace blink
+class WebContentLayerMock : public WebContentLayer {
+public:
+    WebContentLayerMock()
+        : m_layer(adoptPtrWillBeNoop(new WebLayerMock()))
+    {
+    }
+    virtual ~WebContentLayerMock() {}
+    WebLayer* layer() override
+    {
+        return m_layer.get();
+    }
+    WebLayerMock& layerMock()
+    {
+        return *m_layer.get();
+    }
+private:
+    OwnPtr<WebLayerMock> m_layer;
+};
+
+class WebCompositorSupportMock : public WebCompositorSupport {
+public:
+    MOCK_METHOD4(createAnimation, WebCompositorAnimation*(const WebCompositorAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int groupId, int animationId));
+    MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*());
+
+    MOCK_METHOD0(createAnimationPlayer, WebCompositorAnimationPlayer*());
+    MOCK_METHOD0(createAnimationTimeline, WebCompositorAnimationTimeline*());
+    MOCK_METHOD1(createContentLayer, WebContentLayer*(WebContentLayerClient*));
+
+    WebFilterOperations* createFilterOperations() override
+    {
+        return new WebFilterOperationsMock();
+    }
+};
 
-namespace blink {
 
 class AnimationCompositorAnimationsTestBase : public ::testing::Test {
 public:
     AnimationCompositorAnimationsTestBase() : m_proxyPlatform(&m_mockCompositor) { }
 
-    class WebCompositorSupportMock : public WebCompositorSupport {
-    public:
-        MOCK_METHOD4(createAnimation, WebCompositorAnimation*(const WebCompositorAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int groupId, int animationId));
-        MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*());
-
-        MOCK_METHOD0(createAnimationPlayer, WebCompositorAnimationPlayer*());
-        MOCK_METHOD0(createAnimationTimeline, WebCompositorAnimationTimeline*());
-    };
-
 private:
     class PlatformProxy : public TestingPlatformSupport {
     public:
@@ -178,6 +204,6 @@ protected:
     }
 };
 
-}
+} // namespace blink
 
 #endif