| Index: gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
 | 
| diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
 | 
| index 28cf3c681b7bb801773dfa77f8eb2f67e37b05be..bd4d764a0b8066ab78926daab85083e4e039f98c 100644
 | 
| --- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
 | 
| +++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
 | 
| @@ -4721,84 +4721,6 @@ TEST_F(GLES2FormatTest, TraceEndCHROMIUM) {
 | 
|    CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
|  }
 | 
|  
 | 
| -TEST_F(GLES2FormatTest, AsyncTexSubImage2DCHROMIUM) {
 | 
| -  cmds::AsyncTexSubImage2DCHROMIUM& cmd =
 | 
| -      *GetBufferAs<cmds::AsyncTexSubImage2DCHROMIUM>();
 | 
| -  void* next_cmd = cmd.Set(
 | 
| -      &cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
 | 
| -      static_cast<GLint>(13), static_cast<GLint>(14), static_cast<GLsizei>(15),
 | 
| -      static_cast<GLsizei>(16), static_cast<GLenum>(17),
 | 
| -      static_cast<GLenum>(18), static_cast<uint32_t>(19),
 | 
| -      static_cast<uint32_t>(20), static_cast<uint32_t>(21),
 | 
| -      static_cast<uint32_t>(22), static_cast<uint32_t>(23));
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexSubImage2DCHROMIUM::kCmdId),
 | 
| -            cmd.header.command);
 | 
| -  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
 | 
| -  EXPECT_EQ(static_cast<GLint>(12), cmd.level);
 | 
| -  EXPECT_EQ(static_cast<GLint>(13), cmd.xoffset);
 | 
| -  EXPECT_EQ(static_cast<GLint>(14), cmd.yoffset);
 | 
| -  EXPECT_EQ(static_cast<GLsizei>(15), cmd.width);
 | 
| -  EXPECT_EQ(static_cast<GLsizei>(16), cmd.height);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(17), cmd.format);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(18), cmd.type);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_id);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(20), cmd.data_shm_offset);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(21), cmd.async_upload_token);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(22), cmd.sync_data_shm_id);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(23), cmd.sync_data_shm_offset);
 | 
| -  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| -}
 | 
| -
 | 
| -TEST_F(GLES2FormatTest, AsyncTexImage2DCHROMIUM) {
 | 
| -  cmds::AsyncTexImage2DCHROMIUM& cmd =
 | 
| -      *GetBufferAs<cmds::AsyncTexImage2DCHROMIUM>();
 | 
| -  void* next_cmd =
 | 
| -      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLint>(12),
 | 
| -              static_cast<GLint>(13), static_cast<GLsizei>(14),
 | 
| -              static_cast<GLsizei>(15), static_cast<GLenum>(16),
 | 
| -              static_cast<GLenum>(17), static_cast<uint32_t>(18),
 | 
| -              static_cast<uint32_t>(19), static_cast<uint32_t>(20),
 | 
| -              static_cast<uint32_t>(21), static_cast<uint32_t>(22));
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexImage2DCHROMIUM::kCmdId),
 | 
| -            cmd.header.command);
 | 
| -  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
 | 
| -  EXPECT_EQ(static_cast<GLint>(12), cmd.level);
 | 
| -  EXPECT_EQ(static_cast<GLint>(13), cmd.internalformat);
 | 
| -  EXPECT_EQ(static_cast<GLsizei>(14), cmd.width);
 | 
| -  EXPECT_EQ(static_cast<GLsizei>(15), cmd.height);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(16), cmd.format);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(17), cmd.type);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(18), cmd.pixels_shm_id);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_offset);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(20), cmd.async_upload_token);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(21), cmd.sync_data_shm_id);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(22), cmd.sync_data_shm_offset);
 | 
| -  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| -}
 | 
| -
 | 
| -TEST_F(GLES2FormatTest, WaitAsyncTexImage2DCHROMIUM) {
 | 
| -  cmds::WaitAsyncTexImage2DCHROMIUM& cmd =
 | 
| -      *GetBufferAs<cmds::WaitAsyncTexImage2DCHROMIUM>();
 | 
| -  void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(cmds::WaitAsyncTexImage2DCHROMIUM::kCmdId),
 | 
| -            cmd.header.command);
 | 
| -  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| -  EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
 | 
| -  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| -}
 | 
| -
 | 
| -TEST_F(GLES2FormatTest, WaitAllAsyncTexImage2DCHROMIUM) {
 | 
| -  cmds::WaitAllAsyncTexImage2DCHROMIUM& cmd =
 | 
| -      *GetBufferAs<cmds::WaitAllAsyncTexImage2DCHROMIUM>();
 | 
| -  void* next_cmd = cmd.Set(&cmd);
 | 
| -  EXPECT_EQ(static_cast<uint32_t>(cmds::WaitAllAsyncTexImage2DCHROMIUM::kCmdId),
 | 
| -            cmd.header.command);
 | 
| -  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| -  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| -}
 | 
| -
 | 
|  TEST_F(GLES2FormatTest, DiscardFramebufferEXTImmediate) {
 | 
|    const int kSomeBaseValueToTestWith = 51;
 | 
|    static GLenum data[] = {
 | 
| 
 |