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

gpu/command_buffer/common/gles2_cmd_format_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!
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_AUTOGEN_H_
 
@@ skipping 8463 matching lines @@
 
   static uint32 ComputeSize() {
     return static_cast<uint32>(sizeof(ValueType));  // NOLINT
   }
 
   void SetHeader() {
     header.SetCmd<ValueType>();
   }
 
   void Init(
-      GLenum _target, GLsizei _levels, GLint _internalFormat, GLsizei _width,
+      GLenum _target, GLsizei _levels, GLenum _internalFormat, GLsizei _width,
       GLsizei _height) {
     SetHeader();
     target = _target;
     levels = _levels;
     internalFormat = _internalFormat;
     width = _width;
     height = _height;
   }
 
   void* Set(
-      void* cmd, GLenum _target, GLsizei _levels, GLint _internalFormat,
+      void* cmd, GLenum _target, GLsizei _levels, GLenum _internalFormat,
       GLsizei _width, GLsizei _height) {
     static_cast<ValueType*>(
         cmd)->Init(_target, _levels, _internalFormat, _width, _height);
     return NextCmdAddress<ValueType>(cmd);
   }
 
   gpu::CommandHeader header;
   uint32 target;
   int32 levels;
-  int32 internalFormat;
+  uint32 internalFormat;
   int32 width;
   int32 height;
 };
 
 COMPILE_ASSERT(sizeof(TexStorage2DEXT) == 24,
                Sizeof_TexStorage2DEXT_is_not_24);
 COMPILE_ASSERT(offsetof(TexStorage2DEXT, header) == 0,
                OffsetOf_TexStorage2DEXT_header_not_0);
 COMPILE_ASSERT(offsetof(TexStorage2DEXT, target) == 4,
                OffsetOf_TexStorage2DEXT_target_not_4);
@@ skipping 800 matching lines @@
 COMPILE_ASSERT(offsetof(TexImageIOSurface2DCHROMIUM, height) == 12,
                OffsetOf_TexImageIOSurface2DCHROMIUM_height_not_12);
 COMPILE_ASSERT(offsetof(TexImageIOSurface2DCHROMIUM, ioSurfaceId) == 16,
                OffsetOf_TexImageIOSurface2DCHROMIUM_ioSurfaceId_not_16);
 COMPILE_ASSERT(offsetof(TexImageIOSurface2DCHROMIUM, plane) == 20,
                OffsetOf_TexImageIOSurface2DCHROMIUM_plane_not_20);
 
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_AUTOGEN_H_