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

cc/gl_renderer_unittest.cc

Index: cc/gl_renderer_unittest.cc
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 5a11cb36aef5036420f976eb4aebfa4c70068729..89c5f63ae87116fcf29ff8ad0142e305d17df313 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -5,6 +5,9 @@
 #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"
@@ -13,10 +16,7 @@
 #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;
@@ -34,7 +34,7 @@ public:
     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();
     }
@@ -242,7 +242,7 @@ public:
     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();
@@ -271,7 +271,7 @@ public:
     {
         // 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();
     }