Update cc snapshot to r127918

webkit/compositor_bindings/WebLayerTreeViewTest.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include <public/WebLayerTreeView.h>
 
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "FakeWebCompositorOutputSurface.h"
 #include "WebLayerTreeViewTestCommon.h"
 #include <gmock/gmock.h>
 #include <public/Platform.h>
-#include <public/WebCompositor.h>
+#include <public/WebCompositorSupport.h>
 #include <public/WebLayer.h>
 #include <public/WebLayerTreeViewClient.h>
 #include <public/WebThread.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
 using namespace WebKit;
 using testing::Mock;
 using testing::Test;
 
@@ skipping 21 matching lines @@
         ASSERT_TRUE(m_view = adoptPtr(WebLayerTreeView::create(client(), *m_rootLayer, WebLayerTreeView::Settings())));
         m_view->setSurfaceReady();
     }
 
     virtual void TearDown()
     {
         Mock::VerifyAndClearExpectations(client());
 
         m_rootLayer.clear();
         m_view.clear();
-        WebKit::WebCompositor::shutdown();
+        WebKit::Platform::current()->compositorSupport()->shutdown();
     }
 
 protected:
     OwnPtr<WebLayer> m_rootLayer;
     OwnPtr<WebLayerTreeView> m_view;
 };
 
 class WebLayerTreeViewSingleThreadTest : public WebLayerTreeViewTestBase {
 protected:
     void composite()
     {
         m_view->composite();
     }
 
     virtual void initializeCompositor() OVERRIDE
     {
-        WebKit::WebCompositor::initialize(0);
+        WebKit::Platform::current()->compositorSupport()->initialize(0);
     }
 
     virtual WebLayerTreeViewClient* client() OVERRIDE
     {
         return &m_client;
     }
 
     MockWebLayerTreeViewClient m_client;
 };
 
@@ skipping 58 matching lines @@
         RefPtr<CancelableTaskWrapper> timeoutTask = adoptRef(new CancelableTaskWrapper(adoptPtr(new TimeoutTask())));
         WebKit::Platform::current()->currentThread()->postDelayedTask(timeoutTask->createTask(), 5000);
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         timeoutTask->cancel();
         m_view->finishAllRendering();
     }
 
     virtual void initializeCompositor() OVERRIDE
     {
         m_webThread = adoptPtr(WebKit::Platform::current()->createThread("WebLayerTreeViewTest"));
-        WebCompositor::initialize(m_webThread.get());
+        WebKit::Platform::current()->compositorSupport()->initialize(m_webThread.get());
     }
 
     virtual WebLayerTreeViewClient* client() OVERRIDE
     {
         return &m_client;
     }
 
     MockWebLayerTreeViewClientForThreadedTests m_client;
     OwnPtr<WebThread> m_webThread;
 };
@@ skipping 15 matching lines @@
 
     EXPECT_CALL(m_client, willBeginFrame());
     EXPECT_CALL(m_client, willCommit());
     EXPECT_CALL(m_client, didCommit());
     EXPECT_CALL(m_client, didBeginFrame());
 
     composite();
 }
 
 } // namespace