Merged in recent changes to command buffer code.

gpu/command_buffer/common/gles2_cmd_format_test_autogen.h

 // This file is auto-generated. DO NOT EDIT!
 
 // This file contains unit tests for gles2 commmands
 // It is included by gles2_cmd_format_test.cc
 
 TEST(GLES2FormatTest, ActiveTexture) {
   ActiveTexture cmd = { 0, };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLenum>(11));
@@ skipping 946 matching lines @@
   EXPECT_EQ(GetAttachedShaders::kCmdId, cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLsizei>(12), cmd.maxcount);
   EXPECT_EQ(static_cast<uint32>(13), cmd.count_shm_id);
   EXPECT_EQ(static_cast<uint32>(14), cmd.count_shm_offset);
   EXPECT_EQ(static_cast<uint32>(15), cmd.shaders_shm_id);
   EXPECT_EQ(static_cast<uint32>(16), cmd.shaders_shm_offset);
 }
 
-TEST(GLES2FormatTest, GetAttribLocation) {
-  GetAttribLocation cmd = { 0, };
-  void* next_cmd = cmd.Set(
-      &cmd,
-      static_cast<GLuint>(11),
-      static_cast<uint32>(12),
-      static_cast<uint32>(13),
-      static_cast<uint32>(14));
-  EXPECT_EQ(GetAttribLocation::kCmdId, cmd.header.command);
-  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
-  EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.name_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.data_size);
-}
-
-TEST(GLES2FormatTest, GetAttribLocationImmediate) {
-  int8 buf[256] = { 0, };
-  GetAttribLocationImmediate& cmd =
-      *static_cast<GetAttribLocationImmediate*>(static_cast<void*>(&buf));
-  static const char* const test_str = "test string";
-  void* next_cmd = cmd.Set(
-      &cmd,
-      static_cast<GLuint>(11),
-      test_str);
-  EXPECT_EQ(GetAttribLocationImmediate::kCmdId, cmd.header.command);
-  EXPECT_EQ(sizeof(cmd) +  // NOLINT
-            RoundSizeToMultipleOfEntries(strlen(test_str)),
-            cmd.header.size * 4);
-  EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  // TODO(gman): check that string got copied.
-}
-
+// TODO(gman): Write test for GetAttribLocation
+// TODO(gman): Write test for GetAttribLocationImmediate
 TEST(GLES2FormatTest, GetBooleanv) {
   GetBooleanv cmd = { 0, };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLenum>(11),
       static_cast<uint32>(12),
       static_cast<uint32>(13));
   EXPECT_EQ(GetBooleanv::kCmdId, cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
   EXPECT_EQ(static_cast<GLenum>(11), cmd.pname);
@@ skipping 270 matching lines @@
       static_cast<uint32>(13),
       static_cast<uint32>(14));
   EXPECT_EQ(GetUniformiv::kCmdId, cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
   EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
   EXPECT_EQ(static_cast<GLint>(12), cmd.location);
   EXPECT_EQ(static_cast<uint32>(13), cmd.params_shm_id);
   EXPECT_EQ(static_cast<uint32>(14), cmd.params_shm_offset);
 }
 
-TEST(GLES2FormatTest, GetUniformLocation) {
-  GetUniformLocation cmd = { 0, };
-  void* next_cmd = cmd.Set(
-      &cmd,
-      static_cast<GLuint>(11),
-      static_cast<uint32>(12),
-      static_cast<uint32>(13),
-      static_cast<uint32>(14));
-  EXPECT_EQ(GetUniformLocation::kCmdId, cmd.header.command);
-  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
-  EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  EXPECT_EQ(static_cast<uint32>(12), cmd.name_shm_id);
-  EXPECT_EQ(static_cast<uint32>(13), cmd.name_shm_offset);
-  EXPECT_EQ(static_cast<uint32>(14), cmd.data_size);
-}
-
-TEST(GLES2FormatTest, GetUniformLocationImmediate) {
-  int8 buf[256] = { 0, };
-  GetUniformLocationImmediate& cmd =
-      *static_cast<GetUniformLocationImmediate*>(static_cast<void*>(&buf));
-  static const char* const test_str = "test string";
-  void* next_cmd = cmd.Set(
-      &cmd,
-      static_cast<GLuint>(11),
-      test_str);
-  EXPECT_EQ(GetUniformLocationImmediate::kCmdId, cmd.header.command);
-  EXPECT_EQ(sizeof(cmd) +  // NOLINT
-            RoundSizeToMultipleOfEntries(strlen(test_str)),
-            cmd.header.size * 4);
-  EXPECT_EQ(static_cast<GLuint>(11), cmd.program);
-  // TODO(gman): check that string got copied.
-}
-
+// TODO(gman): Write test for GetUniformLocation
+// TODO(gman): Write test for GetUniformLocationImmediate
 TEST(GLES2FormatTest, GetVertexAttribfv) {
   GetVertexAttribfv cmd = { 0, };
   void* next_cmd = cmd.Set(
       &cmd,
       static_cast<GLuint>(11),
       static_cast<GLenum>(12),
       static_cast<uint32>(13),
       static_cast<uint32>(14));
   EXPECT_EQ(GetVertexAttribfv::kCmdId, cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
@@ skipping 1416 matching lines @@
 }
 
 TEST(GLES2FormatTest, SwapBuffers) {
   SwapBuffers cmd = { 0, };
   void* next_cmd = cmd.Set(
       &cmd);
   EXPECT_EQ(SwapBuffers::kCmdId, cmd.header.command);
   EXPECT_EQ(sizeof(cmd), cmd.header.size * 4);  // NOLINT
 }