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

cc/heads_up_display_layer_impl.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 "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"
 #include "CCFrameRateCounter.h"
 #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 {
 
 static inline SkPaint createPaint()
 {
     // The SkCanvas is in RGBA but the shader is expecting BGRA, so we need to
     // swizzle our colors when drawing to the SkCanvas.
     SkColorMatrix swizzleMatrix;
     for (int i = 0; i < 20; ++i)
         swizzleMatrix.fMat[i] = 0;
@@ skipping 27 matching lines @@
 
     if (!m_hudTexture)
         m_hudTexture = CCScopedTexture::create(resourceProvider);
 
     // FIXME: Scale the HUD by deviceScale to make it more friendly under high DPI.
 
     if (m_hudTexture->size() != bounds())
         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)
 {
     if (!m_hudTexture->id())
         return;
 
     CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
 
     IntRect quadRect(IntPoint(), bounds());
@@ skipping 206 matching lines @@
         canvas->drawRect(skRect, paint);
     }
 }
 
 const char* CCHeadsUpDisplayLayerImpl::layerTypeAsString() const
 {
     return "HeadsUpDisplayLayer";
 }
 
 }