Revert r118525 / Re-land r118240 - the build failure was a flake.

gpu/command_buffer/client/gles2_c_lib_autogen.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
 
 // This file is auto-generated from
 // gpu/command_buffer/build_gles2_cmd_buffer.py
 // DO NOT EDIT!
 
-// These functions emluate GLES2 over command buffers.
+// These functions emulate GLES2 over command buffers.
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_C_LIB_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_C_LIB_AUTOGEN_H_
 
 void GLES2ActiveTexture(GLenum texture) {
   gles2::GetGLContext()->ActiveTexture(texture);
 }
 void GLES2AttachShader(GLuint program, GLuint shader) {
   gles2::GetGLContext()->AttachShader(program, shader);
 }
 void GLES2BindAttribLocation(GLuint program, GLuint index, const char* name) {
@@ skipping 488 matching lines @@
   gles2::GetGLContext()->BlitFramebufferEXT(
       srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 void GLES2RenderbufferStorageMultisampleEXT(
     GLenum target, GLsizei samples, GLenum internalformat, GLsizei width,
     GLsizei height) {
   gles2::GetGLContext()->RenderbufferStorageMultisampleEXT(
       target, samples, internalformat, width, height);
 }
 void GLES2TexStorage2DEXT(
-    GLenum target, GLsizei levels, GLint internalFormat, GLsizei width,
+    GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width,
     GLsizei height) {
   gles2::GetGLContext()->TexStorage2DEXT(
       target, levels, internalFormat, width, height);
 }
 void GLES2SwapBuffers() {
   gles2::GetGLContext()->SwapBuffers();
 }
 GLuint GLES2GetMaxValueInBufferCHROMIUM(
     GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
   return gles2::GetGLContext()->GetMaxValueInBufferCHROMIUM(
@@ skipping 68 matching lines @@
 }
 void GLES2TexImageIOSurface2DCHROMIUM(
     GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId,
     GLuint plane) {
   gles2::GetGLContext()->TexImageIOSurface2DCHROMIUM(
       target, width, height, ioSurfaceId, plane);
 }
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_C_LIB_AUTOGEN_H_