CC Animation: Move files from cc_blink to Source/platform/animation

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 7573477f2855901fc780297e4473c5f4bd70d183..3e2e5cb1e5121f75da7e2829a61f3a53e6250cfd 100644
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h
@@ -26,12 +26,13 @@
 #define CompositorAnimationsTestHelper_h
 
 #include "core/animation/CompositorAnimations.h"
+#include "platform/CompositorFactory.h"
+#include "platform/animation/WebCompositorAnimationPlayer.h"
+#include "platform/animation/WebCompositorAnimationTimeline.h"
+#include "platform/animation/WebFloatAnimationCurve.h"
+#include "platform/animation/WebFloatKeyframe.h"
 #include "platform/testing/TestingPlatformSupport.h"
-#include "public/platform/WebCompositorAnimationPlayer.h"
-#include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
-#include "public/platform/WebFloatAnimationCurve.h"
-#include "public/platform/WebFloatKeyframe.h"
 #include "wtf/PassOwnPtr.h"
 
 #include <gmock/gmock.h>
@@ -110,7 +111,7 @@ public:
     virtual WebCompositorAnimationCurve::AnimationCurveType type() const { return CurveId; }
 
     MOCK_METHOD0(delete_, void());
-    ~WebCompositorAnimationCurveMock() { delete_(); }
+    ~WebCompositorAnimationCurveMock() override { delete_(); }
 };
 
 using WebFloatAnimationCurveMock = WebCompositorAnimationCurveMock<WebFloatAnimationCurve, WebCompositorAnimationCurve::AnimationCurveTypeFloat, WebFloatKeyframe>;
@@ -144,9 +145,12 @@ public:
 
     class WebCompositorSupportMock : public WebCompositorSupport {
     public:
+    };
+
+    class CompositorFactoryMock : public CompositorFactory {
+    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*());
     };
@@ -165,7 +169,7 @@ private:
     PlatformProxy m_proxyPlatform;
 
 protected:
-    virtual void SetUp()
+    void SetUp() override
     {
         m_mockCompositor = 0;
         Platform::initialize(&m_proxyPlatform);