Fix Animations, Remove Compostior Animations.

sky/engine/core/animation/CompositorAnimationsTestHelper.h

Index: sky/engine/core/animation/CompositorAnimationsTestHelper.h
diff --git a/sky/engine/core/animation/CompositorAnimationsTestHelper.h b/sky/engine/core/animation/CompositorAnimationsTestHelper.h
deleted file mode 100644
index 3759d8e1299cdde2ebd0a42a9cc39700ea4d0a69..0000000000000000000000000000000000000000
--- a/sky/engine/core/animation/CompositorAnimationsTestHelper.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SKY_ENGINE_CORE_ANIMATION_COMPOSITORANIMATIONSTESTHELPER_H_
-#define SKY_ENGINE_CORE_ANIMATION_COMPOSITORANIMATIONSTESTHELPER_H_
-
-#include "sky/engine/core/animation/CompositorAnimations.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/platform/WebCompositorSupport.h"
-#include "sky/engine/public/platform/WebFloatAnimationCurve.h"
-#include "sky/engine/public/platform/WebFloatKeyframe.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-
-namespace testing {
-
-template<typename T>
-PassOwnPtr<T> CloneToPassOwnPtr(T& o)
-{
-    return adoptPtr(new T(o));
-}
-
-} // namespace testing
-
-
-// Test helpers and mocks for Web* types
-// -----------------------------------------------------------------------
-namespace blink {
-
-// WebFloatKeyframe is a plain struct, so we just create an == operator
-// for it.
-inline bool operator==(const WebFloatKeyframe& a, const WebFloatKeyframe& b)
-{
-    return a.time == b.time && a.value == b.value;
-}
-
-inline void PrintTo(const WebFloatKeyframe& frame, ::std::ostream* os)
-{
-    *os << "WebFloatKeyframe@" << &frame << "(" << frame.time << ", " << frame.value << ")";
-}
-
-// -----------------------------------------------------------------------
-
-class WebCompositorAnimationMock : public WebCompositorAnimation {
-private:
-    WebCompositorAnimation::TargetProperty m_property;
-
-public:
-    // Target Property is set through the constructor.
-    WebCompositorAnimationMock(WebCompositorAnimation::TargetProperty p) : m_property(p) { }
-    virtual WebCompositorAnimation::TargetProperty targetProperty() const { return m_property; };
-
-    MOCK_METHOD0(id, int());
-
-    MOCK_CONST_METHOD0(iterations, double());
-    MOCK_METHOD1(setIterations, void(double));
-
-    MOCK_CONST_METHOD0(startTime, double());
-    MOCK_METHOD1(setStartTime, void(double));
-
-    MOCK_CONST_METHOD0(timeOffset, double());
-    MOCK_METHOD1(setTimeOffset, void(double));
-
-    MOCK_CONST_METHOD0(alternatesDirection, bool());
-    MOCK_METHOD1(setAlternatesDirection, void(bool));
-
-    MOCK_METHOD0(delete_, void());
-    ~WebCompositorAnimationMock() { delete_(); }
-};
-
-template<typename CurveType, WebCompositorAnimationCurve::AnimationCurveType CurveId, typename KeyframeType>
-class WebCompositorAnimationCurveMock : public CurveType {
-public:
-    MOCK_METHOD1_T(add, void(const KeyframeType&));
-    MOCK_METHOD2_T(add, void(const KeyframeType&, WebCompositorAnimationCurve::TimingFunctionType));
-    MOCK_METHOD5_T(add, void(const KeyframeType&, double, double, double, double));
-
-    MOCK_CONST_METHOD1_T(getValue, float(double)); // Only on WebFloatAnimationCurve, but can't hurt to have here.
-
-    virtual WebCompositorAnimationCurve::AnimationCurveType type() const { return CurveId; };
-
-    MOCK_METHOD0(delete_, void());
-    ~WebCompositorAnimationCurveMock() { delete_(); }
-};
-
-typedef WebCompositorAnimationCurveMock<WebFloatAnimationCurve, WebCompositorAnimationCurve::AnimationCurveTypeFloat, WebFloatKeyframe> WebFloatAnimationCurveMock;
-
-} // namespace blink
-
-namespace blink {
-
-class AnimationCompositorAnimationsTestBase : public ::testing::Test {
-public:
-    AnimationCompositorAnimationsTestBase() : m_proxyPlatform(&m_mockCompositor) { };
-
-    class WebCompositorSupportMock : public WebCompositorSupport {
-    public:
-        MOCK_METHOD3(createAnimation, WebCompositorAnimation*(const WebCompositorAnimationCurve& curve, WebCompositorAnimation::TargetProperty target, int animationId));
-        MOCK_METHOD0(createFloatAnimationCurve, WebFloatAnimationCurve*());
-    };
-
-private:
-    class PlatformProxy : public Platform {
-    public:
-        PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(compositor) { }
-    private:
-        WebCompositorSupportMock** m_compositor;
-        virtual WebCompositorSupport* compositorSupport() override { return *m_compositor; }
-    };
-
-    WebCompositorSupportMock* m_mockCompositor;
-    PlatformProxy m_proxyPlatform;
-
-protected:
-    Platform* m_platform;
-
-    virtual void SetUp()
-    {
-        m_mockCompositor = 0;
-        m_platform = Platform::current();
-        Platform::initialize(&m_proxyPlatform);
-    }
-
-    virtual void TearDown()
-    {
-        Platform::initialize(m_platform);
-    }
-
-    void setCompositorForTesting(WebCompositorSupportMock& mock)
-    {
-        ASSERT(!m_mockCompositor);
-        m_mockCompositor = &mock;
-    }
-};
-
-}
-
-#endif  // SKY_ENGINE_CORE_ANIMATION_COMPOSITORANIMATIONSTESTHELPER_H_