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

cc/content_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 "ContentLayerChromium.h"
 
 #include "base/time.h"
 #include "BitmapCanvasLayerTextureUpdater.h"
@@ skipping 77 matching lines @@
     if (m_textureUpdater)
         return;
     if (layerTreeHost()->settings().acceleratePainting)
         m_textureUpdater = FrameBufferSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client));
     else if (CCSettings::perTilePaintingEnabled())
         m_textureUpdater = BitmapSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client));
     else
         m_textureUpdater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client));
     m_textureUpdater->setOpaque(contentsOpaque());
 
-    GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
+    GLenum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
     setTextureFormat(textureFormat);
     setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat));
 }
 
 void ContentLayerChromium::setContentsOpaque(bool opaque)
 {
     LayerChromium::setContentsOpaque(opaque);
     if (m_textureUpdater)
         m_textureUpdater->setOpaque(opaque);
 }
 
 }