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

cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc

Index: cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
diff --git a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
index 7c381038fb9661045d8d19b84dc7d0db582958d2..e60058abaa6ab52e56587c67061aeadcb564e054 100644
--- a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
@@ -45,7 +45,7 @@ PassOwnPtr<LayerTextureUpdater::Texture> FrameBufferSkPictureCanvasLayerTextureU
     return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
 }
 
-LayerTextureUpdater::SampledTexelFormat FrameBufferSkPictureCanvasLayerTextureUpdater::sampledTexelFormat(GC3Denum textureFormat)
+LayerTextureUpdater::SampledTexelFormat FrameBufferSkPictureCanvasLayerTextureUpdater::sampledTexelFormat(GLenum textureFormat)
 {
     // Here we directly render to the texture, so the component order is always correct.
     return LayerTextureUpdater::SampledTexelFormatRGBA;