Merged GraphicsContext3DPrivate into GraphicsContext3D

Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp

 /*
  * Copyright (C) 2011 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
@@ skipping 10 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "core/platform/graphics/chromium/Canvas2DLayerBridge.h"
 
 #include "FakeWebGraphicsContext3D.h"
 #include "SkDeferredCanvas.h"
-#include "core/platform/chromium/support/GraphicsContext3DPrivate.h"
 #include "core/platform/graphics/ImageBuffer.h"
 #include <public/Platform.h>
 #include <public/WebThread.h>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
 using namespace WebCore;
 using namespace WebKit;
@@ skipping 16 matching lines @@
 public:
     MOCK_METHOD3(appendCopy, void(unsigned, unsigned, WebSize));
 };
 
 } // namespace
 
 class Canvas2DLayerBridgeTest : public Test {
 protected:
     void fullLifecycleTest(Canvas2DLayerBridge::ThreadMode threadMode)
     {
-        RefPtr<GraphicsContext3D> mainContext = GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext));
+        RefPtr<GraphicsContext3D> mainContext = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext));
 
-        MockCanvasContext& mainMock = *static_cast<MockCanvasContext*>(GraphicsContext3DPrivate::extractWebGraphicsContext3D(mainContext.get()));
+        MockCanvasContext& mainMock = *static_cast<MockCanvasContext*>(mainContext->webContext());
 
         MockWebTextureUpdater updater;
 
         SkDevice device(SkBitmap::kARGB_8888_Config, 300, 150);
         SkDeferredCanvas canvas(&device);
 
         ::testing::Mock::VerifyAndClearExpectations(&mainMock);
 
         OwnPtr<Canvas2DLayerBridge> bridge = Canvas2DLayerBridge::create(mainContext.release(), &canvas, Canvas2DLayerBridge::NonOpaque, threadMode);
 
@@ skipping 18 matching lines @@
 {
     fullLifecycleTest(Canvas2DLayerBridge::SingleThread);
 }
 
 TEST_F(Canvas2DLayerBridgeTest, testFullLifecycleThreaded)
 {
     fullLifecycleTest(Canvas2DLayerBridge::Threaded);
 }
 
 } // namespace