Merged GraphicsContext3DPrivate into GraphicsContext3D

Source/WebKit/chromium/tests/DrawingBufferTest.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * 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.
  */
 
 #include "config.h"
 
 #include "core/platform/graphics/gpu/DrawingBuffer.h"
 
 #include "FakeWebGraphicsContext3D.h"
-#include "core/platform/chromium/support/GraphicsContext3DPrivate.h"
+#include "core/platform/graphics/GraphicsContext3D.h"
 #include <public/Platform.h>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
 using namespace WebCore;
 using namespace WebKit;
 using testing::Test;
 using testing::_;
@@ skipping 11 matching lines @@
     IntSize oldestContextSize() { return IntSize(); }
 };
 
 } // namespace
 
 class DrawingBufferTest : public Test {
 protected:
     virtual void SetUp()
     {
         RefPtr<FakeContextEvictionManager> contextEvictionManager = adoptRef(new FakeContextEvictionManager());
-        RefPtr<GraphicsContext3D> context = GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new FakeWebGraphicsContext3D));
+        RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new FakeWebGraphicsContext3D));
         const IntSize size(100, 100);
         m_drawingBuffer = DrawingBuffer::create(context.get(), size, DrawingBuffer::Discard, contextEvictionManager.release());
     }
 
     RefPtr<DrawingBuffer> m_drawingBuffer;
 };
 
 namespace {
 
 TEST_F(DrawingBufferTest, verifyNoNewBuffersAfterContextLostWithTextures)
@@ skipping 13 matching lines @@
 {
     // Tell the buffer its contents changed and context was lost.
     m_drawingBuffer->markContentsChanged();
     m_drawingBuffer->releaseResources();
 
     WebKit::WebExternalTextureMailbox mailbox;
     EXPECT_FALSE(m_drawingBuffer->prepareMailbox(&mailbox));
 }
 
 } // namespace