Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/gl_renderer_unittest.cc

 // 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 "CCRendererGL.h"
 
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCDrawQuad.h"
 #include "CCPrioritizedTextureManager.h"
 #include "CCResourceProvider.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "CCTestCommon.h"
 #include "FakeWebCompositorOutputSurface.h"
 #include "FakeWebGraphicsContext3D.h"
-#include "GraphicsContext3D.h"
 #include "WebCompositorInitializer.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
 class FrameCountingMemoryAllocationSettingContext : public FakeWebGraphicsContext3D {
 public:
     FrameCountingMemoryAllocationSettingContext() : m_frame(0) { }
 
     // WebGraphicsContext3D methods.
 
     // This method would normally do a glSwapBuffers under the hood.
     virtual void prepareTexture() { m_frame++; }
     virtual void setMemoryAllocationChangedCallbackCHROMIUM(WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) { m_memoryAllocationChangedCallback = callback; }
     virtual WebString getString(WebKit::WGC3Denum name)
     {
-        if (name == GraphicsContext3D::EXTENSIONS)
+        if (name == GL_EXTENSIONS)
             return WebString("GL_CHROMIUM_set_visibility GL_CHROMIUM_gpu_memory_manager GL_CHROMIUM_discard_framebuffer");
         return WebString();
     }
 
     // Methods added for test.
     int frameCount() { return m_frame; }
     void setMemoryAllocation(WebGraphicsMemoryAllocation allocation)
     {
         ASSERT(CCProxy::isImplThread());
         // In single threaded mode we expect this callback on main thread.
@@ skipping 187 matching lines @@
     virtual void getAttachedShaders(WebGLId program, WGC3Dsizei maxCount, WGC3Dsizei* count, WebGLId* shaders) { ADD_FAILURE(); }
     virtual WGC3Dint getAttribLocation(WebGLId program, const WGC3Dchar* name) { ADD_FAILURE(); return 0; }
     virtual void getBooleanv(WGC3Denum pname, WGC3Dboolean* value) { ADD_FAILURE(); }
     virtual void getBufferParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) { ADD_FAILURE(); }
     virtual Attributes getContextAttributes() { ADD_FAILURE(); return m_attrs; }
     virtual WGC3Denum getError() { ADD_FAILURE(); return 0; }
     virtual void getFloatv(WGC3Denum pname, WGC3Dfloat* value) { ADD_FAILURE(); }
     virtual void getFramebufferAttachmentParameteriv(WGC3Denum target, WGC3Denum attachment, WGC3Denum pname, WGC3Dint* value) { ADD_FAILURE(); }
     virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value)
     {
-        if (pname == GraphicsContext3D::MAX_TEXTURE_SIZE)
+        if (pname == GL_MAX_TEXTURE_SIZE)
             *value = 1024; // MAX_TEXTURE_SIZE is cached client side, so it's OK to query.
         else
             ADD_FAILURE();
     }
 
     // We allow querying the shader compilation and program link status in debug mode, but not release.
     virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value)
     {
 #ifndef NDEBUG
         *value = 1;
 #else
         ADD_FAILURE();
 #endif
     }
 
     virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value)
     {
 #ifndef NDEBUG
         *value = 1;
 #else
         ADD_FAILURE();
 #endif
     }
 
     virtual WebString getString(WGC3Denum name)
     {
         // We allow querying the extension string.
         // FIXME: It'd be better to check that we only do this before starting any other expensive work (like starting a compilation)
-        if (name != GraphicsContext3D::EXTENSIONS)
+        if (name != GL_EXTENSIONS)
             ADD_FAILURE();
         return WebString();
     }
 
     virtual WebString getProgramInfoLog(WebGLId program) { ADD_FAILURE(); return WebString(); }
     virtual void getRenderbufferParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) { ADD_FAILURE(); }
 
     virtual WebString getShaderInfoLog(WebGLId shader) { ADD_FAILURE(); return WebString(); }
     virtual void getShaderPrecisionFormat(WGC3Denum shadertype, WGC3Denum precisiontype, WGC3Dint* range, WGC3Dint* precision) { ADD_FAILURE(); }
     virtual WebString getShaderSource(WebGLId shader) { ADD_FAILURE(); return WebString(); }
@@ skipping 134 matching lines @@
     FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
 
     mockClient.rootRenderPass()->setHasTransparentBackground(true);
 
     EXPECT_TRUE(renderer.initialize());
 
     renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPasses());
 
     EXPECT_EQ(1, context->clearCount());
 }