| 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 b26afb1c976425f7d1d2e5d834b295d0e60f05ca..9e91d00871c83b7dfa78d90f00781c4ee9df9b36 100644
 | 
| --- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
 | 
| +++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
 | 
| @@ -3143,6 +3143,111 @@ TEST_F(GLES2FormatTest, BindUniformLocationCHROMIUMBucket) {
 | 
|    CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
|  }
 | 
|  
 | 
| +TEST_F(GLES2FormatTest, GenValuebuffersCHROMIUMImmediate) {
 | 
| +  static GLuint ids[] = {
 | 
| +      12, 23, 34,
 | 
| +  };
 | 
| +  cmds::GenValuebuffersCHROMIUMImmediate& cmd =
 | 
| +      *GetBufferAs<cmds::GenValuebuffersCHROMIUMImmediate>();
 | 
| +  void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
 | 
| +  EXPECT_EQ(
 | 
| +      static_cast<uint32_t>(cmds::GenValuebuffersCHROMIUMImmediate::kCmdId),
 | 
| +      cmd.header.command);
 | 
| +  EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
 | 
| +            cmd.header.size * 4u);
 | 
| +  EXPECT_EQ(static_cast<GLsizei>(arraysize(ids)), cmd.n);
 | 
| +  CheckBytesWrittenMatchesExpectedSize(
 | 
| +      next_cmd,
 | 
| +      sizeof(cmd) + RoundSizeToMultipleOfEntries(arraysize(ids) * 4u));
 | 
| +  // TODO(gman): Check that ids were inserted;
 | 
| +}
 | 
| +
 | 
| +TEST_F(GLES2FormatTest, DeleteValuebuffersCHROMIUMImmediate) {
 | 
| +  static GLuint ids[] = {
 | 
| +      12, 23, 34,
 | 
| +  };
 | 
| +  cmds::DeleteValuebuffersCHROMIUMImmediate& cmd =
 | 
| +      *GetBufferAs<cmds::DeleteValuebuffersCHROMIUMImmediate>();
 | 
| +  void* next_cmd = cmd.Set(&cmd, static_cast<GLsizei>(arraysize(ids)), ids);
 | 
| +  EXPECT_EQ(
 | 
| +      static_cast<uint32_t>(cmds::DeleteValuebuffersCHROMIUMImmediate::kCmdId),
 | 
| +      cmd.header.command);
 | 
| +  EXPECT_EQ(sizeof(cmd) + RoundSizeToMultipleOfEntries(cmd.n * 4u),
 | 
| +            cmd.header.size * 4u);
 | 
| +  EXPECT_EQ(static_cast<GLsizei>(arraysize(ids)), cmd.n);
 | 
| +  CheckBytesWrittenMatchesExpectedSize(
 | 
| +      next_cmd,
 | 
| +      sizeof(cmd) + RoundSizeToMultipleOfEntries(arraysize(ids) * 4u));
 | 
| +  // TODO(gman): Check that ids were inserted;
 | 
| +}
 | 
| +
 | 
| +TEST_F(GLES2FormatTest, IsValuebufferCHROMIUM) {
 | 
| +  cmds::IsValuebufferCHROMIUM& cmd =
 | 
| +      *GetBufferAs<cmds::IsValuebufferCHROMIUM>();
 | 
| +  void* next_cmd =
 | 
| +      cmd.Set(&cmd, static_cast<GLuint>(11), static_cast<uint32_t>(12),
 | 
| +              static_cast<uint32_t>(13));
 | 
| +  EXPECT_EQ(static_cast<uint32_t>(cmds::IsValuebufferCHROMIUM::kCmdId),
 | 
| +            cmd.header.command);
 | 
| +  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| +  EXPECT_EQ(static_cast<GLuint>(11), cmd.valuebuffer);
 | 
| +  EXPECT_EQ(static_cast<uint32_t>(12), cmd.result_shm_id);
 | 
| +  EXPECT_EQ(static_cast<uint32_t>(13), cmd.result_shm_offset);
 | 
| +  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| +}
 | 
| +
 | 
| +TEST_F(GLES2FormatTest, BindValuebufferCHROMIUM) {
 | 
| +  cmds::BindValuebufferCHROMIUM& cmd =
 | 
| +      *GetBufferAs<cmds::BindValuebufferCHROMIUM>();
 | 
| +  void* next_cmd =
 | 
| +      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLuint>(12));
 | 
| +  EXPECT_EQ(static_cast<uint32_t>(cmds::BindValuebufferCHROMIUM::kCmdId),
 | 
| +            cmd.header.command);
 | 
| +  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| +  EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
 | 
| +  EXPECT_EQ(static_cast<GLuint>(12), cmd.valuebuffer);
 | 
| +  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| +}
 | 
| +
 | 
| +TEST_F(GLES2FormatTest, SubscribeValueCHROMIUM) {
 | 
| +  cmds::SubscribeValueCHROMIUM& cmd =
 | 
| +      *GetBufferAs<cmds::SubscribeValueCHROMIUM>();
 | 
| +  void* next_cmd =
 | 
| +      cmd.Set(&cmd, static_cast<GLenum>(11), static_cast<GLenum>(12));
 | 
| +  EXPECT_EQ(static_cast<uint32_t>(cmds::SubscribeValueCHROMIUM::kCmdId),
 | 
| +            cmd.header.command);
 | 
| +  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| +  EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
 | 
| +  EXPECT_EQ(static_cast<GLenum>(12), cmd.subscription);
 | 
| +  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| +}
 | 
| +
 | 
| +TEST_F(GLES2FormatTest, PopulateSubscribedValuesCHROMIUM) {
 | 
| +  cmds::PopulateSubscribedValuesCHROMIUM& cmd =
 | 
| +      *GetBufferAs<cmds::PopulateSubscribedValuesCHROMIUM>();
 | 
| +  void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11));
 | 
| +  EXPECT_EQ(
 | 
| +      static_cast<uint32_t>(cmds::PopulateSubscribedValuesCHROMIUM::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, UniformValuebufferCHROMIUM) {
 | 
| +  cmds::UniformValuebufferCHROMIUM& cmd =
 | 
| +      *GetBufferAs<cmds::UniformValuebufferCHROMIUM>();
 | 
| +  void* next_cmd = cmd.Set(&cmd, static_cast<GLint>(11),
 | 
| +                           static_cast<GLenum>(12), static_cast<GLenum>(13));
 | 
| +  EXPECT_EQ(static_cast<uint32_t>(cmds::UniformValuebufferCHROMIUM::kCmdId),
 | 
| +            cmd.header.command);
 | 
| +  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
 | 
| +  EXPECT_EQ(static_cast<GLint>(11), cmd.location);
 | 
| +  EXPECT_EQ(static_cast<GLenum>(12), cmd.target);
 | 
| +  EXPECT_EQ(static_cast<GLenum>(13), cmd.subscription);
 | 
| +  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 | 
| +}
 | 
| +
 | 
|  TEST_F(GLES2FormatTest, BindTexImage2DCHROMIUM) {
 | 
|    cmds::BindTexImage2DCHROMIUM& cmd =
 | 
|        *GetBufferAs<cmds::BindTexImage2DCHROMIUM>();
 | 
| 
 |