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

cc/layer_tree_host_unittest.cc

Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index db9ec89b8f204dedfbc152b28b1b7c056d70236b..00ff33c934512c4696e4bc58f0f102099ab11b4d 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -6,6 +6,9 @@
 
 #include "CCLayerTreeHost.h"
 
+#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
 #include "CCGeometryTestUtils.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostImpl.h"
@@ -17,9 +20,7 @@
 #include "CCTimingFunction.h"
 #include "ContentLayerChromium.h"
 #include "ContentLayerChromiumClient.h"
-#include "Extensions3DChromium.h"
 #include "FakeWebCompositorOutputSurface.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include <public/Platform.h>
 #include <public/WebLayerScrollClient.h>
 #include <public/WebSize.h>
@@ -2420,7 +2421,7 @@ private:
         if (m_texture.get())
             return;
         m_texture = CCPrioritizedTexture::create(layerTreeHost()->contentsTextureManager());
-        m_texture->setDimensions(IntSize(10, 10), cc::GraphicsContext3D::RGBA);
+        m_texture->setDimensions(IntSize(10, 10), GL_RGBA);
         m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
     }
 
@@ -2724,8 +2725,8 @@ public:
     virtual void setContextLostCallback(WebGraphicsContextLostCallback* callback) { m_contextLostCallback = callback; }
     virtual bool isContextLost() { return m_isContextLost; }
 
-    virtual void beginQueryEXT(GC3Denum, WebGLId) { }
-    virtual void endQueryEXT(GC3Denum)
+    virtual void beginQueryEXT(WGC3Denum, WebGLId) { }
+    virtual void endQueryEXT(WGC3Denum)
     {
         // Lose context.
         if (!m_isContextLost) {
@@ -2733,10 +2734,10 @@ public:
             m_isContextLost = true;
         }
     }
-    virtual void getQueryObjectuivEXT(WebGLId, GC3Denum pname, GC3Duint* params)
+    virtual void getQueryObjectuivEXT(WebGLId, WGC3Denum pname, WGC3Duint* params)
     {
         // Context is lost. We need to behave as if result is available.
-        if (pname == Extensions3DChromium::QUERY_RESULT_AVAILABLE_EXT)
+        if (pname == GL_QUERY_RESULT_AVAILABLE_EXT)
             *params = 1;
     }