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

cc/texture_layer.cc

 // Copyright 2010 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 "TextureLayerChromium.h"
 
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCLayerTreeHost.h"
 #include "CCTextureLayerImpl.h"
-#include "GraphicsContext3D.h"
 #include "TextureLayerChromiumClient.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
 scoped_refptr<TextureLayerChromium> TextureLayerChromium::create(TextureLayerChromiumClient* client)
 {
     return scoped_refptr<TextureLayerChromium>(new TextureLayerChromium(client));
 }
 
@@ skipping 83 matching lines @@
 
 bool TextureLayerChromium::drawsContent() const
 {
     return (m_client || m_textureId) && !m_contextLost && LayerChromium::drawsContent();
 }
 
 void TextureLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker*, CCRenderingStats&)
 {
     if (m_client) {
         m_textureId = m_client->prepareTexture(queue);
-        m_contextLost = m_client->context()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR;
+        m_contextLost = m_client->context()->getGraphicsResetStatusARB() != GL_NO_ERROR;
     }
 
     m_needsDisplay = false;
 }
 
 void TextureLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
 {
     LayerChromium::pushPropertiesTo(layer);
 
     CCTextureLayerImpl* textureLayer = static_cast<CCTextureLayerImpl*>(layer);
     textureLayer->setFlipped(m_flipped);
     textureLayer->setUVRect(m_uvRect);
     textureLayer->setPremultipliedAlpha(m_premultipliedAlpha);
     textureLayer->setTextureId(m_textureId);
 }
 
 }