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

cc/image_layer.cc

Index: cc/image_layer.cc
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index 286ee8bc92f07befcaf42f37c1c57cca51a70ad8..7bb3362c16af209d8ef11b34a47f17d757b40040 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -48,7 +48,7 @@ public:
         return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
     }
 
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE
+    virtual SampledTexelFormat sampledTexelFormat(GLenum textureFormat) OVERRIDE
     {
         return PlatformColor::sameComponentOrder(textureFormat) ?
                 LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
@@ -135,7 +135,7 @@ void ImageLayerChromium::createTextureUpdaterIfNeeded()
         return;
 
     m_textureUpdater = ImageLayerTextureUpdater::create();
-    GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
+    GLenum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
     setTextureFormat(textureFormat);
     setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat));
 }