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

gpu/command_buffer/service/gles2_cmd_decoder_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!
 
 // It is included by gles2_cmd_decoder.cc
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_AUTOGEN_H_
@@ skipping 2527 matching lines @@
   }
   DoRenderbufferStorageMultisample(
       target, samples, internalformat, width, height);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleTexStorage2DEXT(
     uint32 immediate_data_size, const gles2::TexStorage2DEXT& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizei levels = static_cast<GLsizei>(c.levels);
-  GLint internalFormat = static_cast<GLint>(c.internalFormat);
+  GLenum internalFormat = static_cast<GLenum>(c.internalFormat);
   GLsizei width = static_cast<GLsizei>(c.width);
   GLsizei height = static_cast<GLsizei>(c.height);
   if (!validators_->texture_target.IsValid(target)) {
     SetGLError(GL_INVALID_ENUM, "glTexStorage2DEXT: target GL_INVALID_ENUM");
     return error::kNoError;
   }
   if (levels < 0) {
     SetGLError(GL_INVALID_VALUE, "glTexStorage2DEXT: levels < 0");
     return error::kNoError;
   }
   if (!validators_->texture_internal_format_storage.IsValid(internalFormat)) {
     SetGLError(
-        GL_INVALID_VALUE,
-        "glTexStorage2DEXT: internalFormat GL_INVALID_VALUE");
+        GL_INVALID_ENUM, "glTexStorage2DEXT: internalFormat GL_INVALID_ENUM");
     return error::kNoError;
   }
   if (width < 0) {
     SetGLError(GL_INVALID_VALUE, "glTexStorage2DEXT: width < 0");
     return error::kNoError;
   }
   if (height < 0) {
     SetGLError(GL_INVALID_VALUE, "glTexStorage2DEXT: height < 0");
     return error::kNoError;
   }
@@ skipping 55 matching lines @@
   if (height < 0) {
     SetGLError(GL_INVALID_VALUE, "glTexImageIOSurface2DCHROMIUM: height < 0");
     return error::kNoError;
   }
   DoTexImageIOSurface2DCHROMIUM(target, width, height, ioSurfaceId, plane);
   return error::kNoError;
 }
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_AUTOGEN_H_