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

cc/heads_up_display_layer_impl.cc

Index: cc/heads_up_display_layer_impl.cc
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 1b94fb36735f5c7a87c3868c9ebc3d7d2bf14cbf..56a6d4327b6a2d4234c7e1278ce74d1bdabe82fd 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -7,6 +7,9 @@
 #include "CCHeadsUpDisplayLayerImpl.h"
 
 #include "base/stringprintf.h"
+#include "skia/ext/platform_canvas.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/point.h"
 #include "CCDebugRectHistory.h"
 #include "CCFontAtlas.h"
@@ -14,12 +17,9 @@
 #include "CCLayerTreeHostImpl.h"
 #include "CCQuadSink.h"
 #include "CCTextureDrawQuad.h"
-#include "Extensions3DChromium.h"
-#include "GraphicsContext3D.h"
 #include "SkBitmap.h"
 #include "SkColorMatrixFilter.h"
 #include "SkPaint.h"
-#include "skia/ext/platform_canvas.h"
 
 namespace cc {
 
@@ -67,7 +67,7 @@ void CCHeadsUpDisplayLayerImpl::willDraw(CCResourceProvider* resourceProvider)
         m_hudTexture->free();
 
     if (!m_hudTexture->id())
-        m_hudTexture->allocate(CCRenderer::ImplPool, bounds(), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny);
+        m_hudTexture->allocate(CCRenderer::ImplPool, bounds(), GL_RGBA, CCResourceProvider::TextureUsageAny);
 }
 
 void CCHeadsUpDisplayLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)