Merged GraphicsContext3DPrivate into GraphicsContext3D

Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp

Index: Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
diff --git a/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp b/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
index 1cf188bf26cb522f86c49cd6e1463a2c766e93bb..b1cc9829d8cb2f6f82c428037fa4da0cf8d375dc 100644
--- a/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
+++ b/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
@@ -28,7 +28,6 @@
 
 #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>
@@ -65,9 +64,9 @@ 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;