Update cc snapshot to r127918

cc/CCThreadedTest.cpp

Index: cc/CCThreadedTest.cpp
diff --git a/cc/CCThreadedTest.cpp b/cc/CCThreadedTest.cpp
index 617614b7a7e965281f6958979a1283c04bffe2e9..5c5723ef2c2a53c274d512518ae1426b1791e4c3 100644
--- a/cc/CCThreadedTest.cpp
+++ b/cc/CCThreadedTest.cpp
@@ -8,6 +8,7 @@
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationTestCommon.h"
+#include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostImpl.h"
@@ -24,7 +25,7 @@
 #include "LayerChromium.h"
 #include <gmock/gmock.h>
 #include <public/Platform.h>
-#include <public/WebCompositor.h>
+#include <public/WebCompositorSupport.h>
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 #include <public/WebThread.h>
@@ -207,6 +208,16 @@ public:
         return m_testHooks->createOutputSurface();
     }
 
+    virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE
+    {
+        m_testHooks->didRecreateOutputSurface(succeeded);
+    }
+
+    virtual PassOwnPtr<CCInputHandler> createInputHandler() OVERRIDE
+    {
+        return nullptr;
+    }
+
     virtual void willCommit() OVERRIDE
     {
     }
@@ -225,11 +236,6 @@ public:
     {
     }
 
-    virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE
-    {
-        m_testHooks->didRecreateOutputSurface(succeeded);
-    }
-
     virtual void scheduleComposite() OVERRIDE
     {
         m_testHooks->scheduleComposite();
@@ -580,13 +586,13 @@ void CCThreadedTest::dispatchDidAddAnimation(void* self)
 void CCThreadedTest::runTest(bool threaded)
 {
     // For these tests, we will enable threaded animations.
-    WebCompositor::setAcceleratedAnimationEnabled(true);
+    Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(true);
 
     if (threaded) {
         m_webThread = adoptPtr(WebKit::Platform::current()->createThread("CCThreadedTest"));
-        WebCompositor::initialize(m_webThread.get());
+        Platform::current()->compositorSupport()->initialize(m_webThread.get());
     } else
-        WebCompositor::initialize(0);
+        Platform::current()->compositorSupport()->initialize(0);
 
     ASSERT(CCProxy::isMainThread());
     m_mainThreadProxy = CCScopedThreadProxy::create(CCProxy::mainThread());
@@ -613,11 +619,11 @@ void CCThreadedTest::runTest(bool threaded)
     m_client.clear();
     if (m_timedOut) {
         FAIL() << "Test timed out";
-        WebCompositor::shutdown();
+        Platform::current()->compositorSupport()->shutdown();
         return;
     }
     afterTest();
-    WebCompositor::shutdown();
+    Platform::current()->compositorSupport()->shutdown();
 }
 
 } // namespace WebKitTests