Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
index 5a0633ac766614c4227839e8a727f985a99255da..12d96c28242e70b5396a8b89c43f25a9485a19df 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
@@ -33,57 +33,58 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<GenQueriesEXT, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::GenQueriesEXT, 0>(
     bool valid) {
   if (!valid) {
     // Make the client_query_id_ so that trying to make it again
     // will fail.
     GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
-    GenQueriesEXT cmd;
+    cmds::GenQueriesEXT cmd;
     cmd.Init(1, shared_memory_id_, shared_memory_offset_);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   }
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<GenQueriesEXTImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::GenQueriesEXTImmediate, 0>(
     bool valid) {
   if (!valid) {
     // Make the client_query_id_ so that trying to make it again
     // will fail.
     GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
-    GenQueriesEXT cmd;
+    cmds::GenQueriesEXT cmd;
     cmd.Init(1, shared_memory_id_, shared_memory_offset_);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   }
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<DeleteQueriesEXT, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::DeleteQueriesEXT, 0>(
     bool valid) {
   if (valid) {
     // Make the client_query_id_ so that trying to delete it will succeed.
     GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
-    GenQueriesEXT cmd;
+    cmds::GenQueriesEXT cmd;
     cmd.Init(1, shared_memory_id_, shared_memory_offset_);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   }
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<DeleteQueriesEXTImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::DeleteQueriesEXTImmediate, 0>(
     bool valid) {
   if (valid) {
     // Make the client_query_id_ so that trying to delete it will succeed.
     GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
-    GenQueriesEXT cmd;
+    cmds::GenQueriesEXT cmd;
     cmd.Init(1, shared_memory_id_, shared_memory_offset_);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   }
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<LinkProgram, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(
+    bool /* valid */) {
   const GLuint kClientVertexShaderId = 5001;
   const GLuint kServiceVertexShaderId = 6001;
   const GLuint kClientFragmentShaderId = 5002;
@@ -93,8 +94,8 @@ void GLES2DecoderTestBase::SpecializedSetup<LinkProgram, 0>(bool /* valid */) {
   DoCreateShader(
       GL_FRAGMENT_SHADER, kClientFragmentShaderId, kServiceFragmentShaderId);
 
-  GetShaderInfo(kClientVertexShaderId)->SetStatus(true, "", NULL);
-  GetShaderInfo(kClientFragmentShaderId)->SetStatus(true, "", NULL);
+  GetShader(kClientVertexShaderId)->SetStatus(true, "", NULL);
+  GetShader(kClientFragmentShaderId)->SetStatus(true, "", NULL);
 
   InSequence dummy;
   EXPECT_CALL(*gl_,
@@ -124,7 +125,7 @@ void GLES2DecoderTestBase::SpecializedSetup<LinkProgram, 0>(bool /* valid */) {
       GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, _))
       .WillOnce(SetArgumentPointee<2>(0));
 
-  AttachShader attach_cmd;
+  cmds::AttachShader attach_cmd;
   attach_cmd.Init(client_program_id_, kClientVertexShaderId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));
 
@@ -133,16 +134,16 @@ void GLES2DecoderTestBase::SpecializedSetup<LinkProgram, 0>(bool /* valid */) {
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<ValidateProgram, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::ValidateProgram, 0>(
     bool /* valid */) {
   // Needs the same setup as LinkProgram.
-  SpecializedSetup<LinkProgram, 0>(false);
+  SpecializedSetup<cmds::LinkProgram, 0>(false);
 
   EXPECT_CALL(*gl_, LinkProgram(kServiceProgramId))
       .Times(1)
       .RetiresOnSaturation();
 
-  LinkProgram link_cmd;
+  cmds::LinkProgram link_cmd;
   link_cmd.Init(client_program_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd));
 
@@ -153,166 +154,181 @@ void GLES2DecoderTestBase::SpecializedSetup<ValidateProgram, 0>(
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform1f, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1f, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform1fv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1fv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform1fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform1iv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1iv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform1ivImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1ivImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_INT);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform2f, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2f, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform2i, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2i, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform2fv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2fv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform2iv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2iv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform2fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform2ivImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2ivImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform3f, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3f, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform3i, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3i, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform3fv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3fv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform3iv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3iv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform3fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform3ivImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3ivImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform4f, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4f, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform4i, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4i, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform4fv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4fv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform4iv, 0>(bool /* valid */) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4iv, 0>(
+    bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform4fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_VEC4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<Uniform4ivImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4ivImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_INT_VEC4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix2fv, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fv, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_MAT2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix2fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_MAT2);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix3fv, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fv, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_MAT3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix3fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_MAT3);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix4fv, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix4fv, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_MAT4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix4fvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(
     bool /* valid */) {
   SetupShaderForUniform(GL_FLOAT_MAT4);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<RenderbufferStorage, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::RenderbufferStorage, 0>(
     bool valid) {
   DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
                     kServiceRenderbufferId);
@@ -331,43 +347,44 @@ void GLES2DecoderTestBase::SpecializedSetup<RenderbufferStorage, 0>(
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<TexParameterf, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterf, 0>(
     bool /* valid */) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<TexParameteri, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameteri, 0>(
     bool /* valid */) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<TexParameterfv, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterfv, 0>(
     bool /* valid */) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<TexParameterfvImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterfvImmediate, 0>(
     bool /* valid */) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<TexParameteriv, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameteriv, 0>(
     bool /* valid */) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<TexParameterivImmediate, 0>(
+void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterivImmediate, 0>(
     bool /* valid */) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 };
 
 template <>
-void GLES2DecoderTestBase::SpecializedSetup<GetVertexAttribiv, 0>(bool valid) {
+void GLES2DecoderTestBase::SpecializedSetup<cmds::GetVertexAttribiv, 0>(
+    bool valid) {
   DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
   DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0);
   if (valid) {