Revert of More regular Platform implementations in unit tests.

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

 /*
  * 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 CompositorAnimationsTestHelper_h
 #define CompositorAnimationsTestHelper_h
 
 #include "core/animation/CompositorAnimations.h"
-#include "platform/testing/TestingPlatformSupport.h"
+#include "public/platform/Platform.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>
 #include <gtest/gtest.h>
 
@@ skipping 105 matching lines @@
     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 {
+    class PlatformProxy : public Platform {
     public:
-        explicit PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(compositor) { }
+        PlatformProxy(WebCompositorSupportMock** compositor) : m_platform(Platform::current()), m_compositor(compositor) { }
+
+        ~PlatformProxy()
+        {
+            blink::Platform::initialize(m_platform);
+        }
+
+        virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); }
+        const unsigned char* getTraceCategoryEnabledFlag(const char* categoryName) override
+        {
+            static const unsigned char tracingIsDisabled = 0;
+            return &tracingIsDisabled;
+        }
+
+        WebThread* currentThread() override
+        {
+            return m_platform->currentThread();
+        }
+
     private:
+        blink::Platform* m_platform; // Not owned.
+        WebCompositorSupportMock** m_compositor;
         WebCompositorSupport* compositorSupport() override { return *m_compositor; }
-
-        WebCompositorSupportMock** m_compositor;
     };
 
     WebCompositorSupportMock* m_mockCompositor;
     PlatformProxy m_proxyPlatform;
 
 protected:
     virtual void SetUp()
     {
         m_mockCompositor = 0;
         Platform::initialize(&m_proxyPlatform);
     }
 
     void setCompositorForTesting(WebCompositorSupportMock& mock)
     {
         ASSERT(!m_mockCompositor);
         m_mockCompositor = &mock;
     }
 };
 
 }
 
 #endif