Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index a3d1412b832eb229715fb77a37d7e335af0f8560..96228b9bf3d63981f8fb1d16b6a4419e35230cad 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -86,13 +86,14 @@ void GLES2DecoderTestBase::InitDecoder(
     bool request_depth,
     bool request_stencil,
     bool bind_generates_resource) {
-  FramebufferManager::FramebufferInfo::ClearFramebufferCompleteComboMap();
+  Framebuffer::ClearFramebufferCompleteComboMap();
   gl_.reset(new StrictMock<MockGLInterface>());
   ::gfx::GLInterface::SetGLInterface(gl_.get());
-  group_ = ContextGroup::Ref(new ContextGroup(NULL,
-                                              NULL,
-                                              memory_tracker_,
-                                              bind_generates_resource));
+  group_ = scoped_refptr<ContextGroup>(new ContextGroup(
+      NULL,
+      NULL,
+      memory_tracker_,
+      bind_generates_resource));
 
   InSequence sequence;
 
@@ -263,23 +264,23 @@ void GLES2DecoderTestBase::InitDecoder(
   EXPECT_CALL(*gl_, GenBuffersARB(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceBufferId))
       .RetiresOnSaturation();
-  GenHelper<GenBuffersImmediate>(client_buffer_id_);
+  GenHelper<cmds::GenBuffersImmediate>(client_buffer_id_);
   EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceFramebufferId))
       .RetiresOnSaturation();
-  GenHelper<GenFramebuffersImmediate>(client_framebuffer_id_);
+  GenHelper<cmds::GenFramebuffersImmediate>(client_framebuffer_id_);
   EXPECT_CALL(*gl_, GenRenderbuffersEXT(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceRenderbufferId))
       .RetiresOnSaturation();
-  GenHelper<GenRenderbuffersImmediate>(client_renderbuffer_id_);
+  GenHelper<cmds::GenRenderbuffersImmediate>(client_renderbuffer_id_);
   EXPECT_CALL(*gl_, GenTextures(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceTextureId))
       .RetiresOnSaturation();
-  GenHelper<GenTexturesImmediate>(client_texture_id_);
+  GenHelper<cmds::GenTexturesImmediate>(client_texture_id_);
   EXPECT_CALL(*gl_, GenBuffersARB(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceElementBufferId))
       .RetiresOnSaturation();
-  GenHelper<GenBuffersImmediate>(client_element_buffer_id_);
+  GenHelper<cmds::GenBuffersImmediate>(client_element_buffer_id_);
 
   DoCreateProgram(client_program_id_, kServiceProgramId);
   DoCreateShader(GL_VERTEX_SHADER, client_shader_id_, kServiceShaderId);
@@ -320,7 +321,7 @@ GLint GLES2DecoderTestBase::GetGLError() {
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
-  GetError cmd;
+  cmds::GetError cmd;
   cmd.Init(shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   return static_cast<GLint>(*GetSharedMemoryAs<GLenum*>());
@@ -332,13 +333,13 @@ void GLES2DecoderTestBase::DoCreateShader(
       .Times(1)
       .WillOnce(Return(service_id))
       .RetiresOnSaturation();
-  CreateShader cmd;
+  cmds::CreateShader cmd;
   cmd.Init(shader_type, client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 bool GLES2DecoderTestBase::DoIsShader(GLuint client_id) {
-  return IsObjectHelper<IsShader, IsShader::Result>(client_id);
+  return IsObjectHelper<cmds::IsShader, cmds::IsShader::Result>(client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteShader(
@@ -346,7 +347,7 @@ void GLES2DecoderTestBase::DoDeleteShader(
   EXPECT_CALL(*gl_, DeleteShader(service_id))
       .Times(1)
       .RetiresOnSaturation();
-  DeleteShader cmd;
+  cmds::DeleteShader cmd;
   cmd.Init(client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -357,18 +358,18 @@ void GLES2DecoderTestBase::DoCreateProgram(
       .Times(1)
       .WillOnce(Return(service_id))
       .RetiresOnSaturation();
-  CreateProgram cmd;
+  cmds::CreateProgram cmd;
   cmd.Init(client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 bool GLES2DecoderTestBase::DoIsProgram(GLuint client_id) {
-  return IsObjectHelper<IsProgram, IsProgram::Result>(client_id);
+  return IsObjectHelper<cmds::IsProgram, cmds::IsProgram::Result>(client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteProgram(
     GLuint client_id, GLuint /* service_id */) {
-  DeleteProgram cmd;
+  cmds::DeleteProgram cmd;
   cmd.Init(client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -551,7 +552,7 @@ void GLES2DecoderTestBase::SetupShaderForUniform(GLenum uniform_type) {
   EXPECT_CALL(*gl_, UseProgram(kServiceProgramId))
       .Times(1)
       .RetiresOnSaturation();
-  UseProgram cmd;
+  cmds::UseProgram cmd;
   cmd.Init(client_program_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -561,13 +562,13 @@ void GLES2DecoderTestBase::DoBindBuffer(
   EXPECT_CALL(*gl_, BindBuffer(target, service_id))
       .Times(1)
       .RetiresOnSaturation();
-  BindBuffer cmd;
+  cmds::BindBuffer cmd;
   cmd.Init(target, client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 bool GLES2DecoderTestBase::DoIsBuffer(GLuint client_id) {
-  return IsObjectHelper<IsBuffer, IsBuffer::Result>(client_id);
+  return IsObjectHelper<cmds::IsBuffer, cmds::IsBuffer::Result>(client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteBuffer(
@@ -575,7 +576,7 @@ void GLES2DecoderTestBase::DoDeleteBuffer(
   EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(service_id)))
       .Times(1)
       .RetiresOnSaturation();
-  DeleteBuffers cmd;
+  cmds::DeleteBuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   memcpy(shared_memory_address_, &client_id, sizeof(client_id));
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -678,13 +679,14 @@ void GLES2DecoderTestBase::DoBindFramebuffer(
   EXPECT_CALL(*gl_, BindFramebufferEXT(target, service_id))
       .Times(1)
       .RetiresOnSaturation();
-  BindFramebuffer cmd;
+  cmds::BindFramebuffer cmd;
   cmd.Init(target, client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 bool GLES2DecoderTestBase::DoIsFramebuffer(GLuint client_id) {
-  return IsObjectHelper<IsFramebuffer, IsFramebuffer::Result>(client_id);
+  return IsObjectHelper<cmds::IsFramebuffer, cmds::IsFramebuffer::Result>(
+      client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteFramebuffer(
@@ -704,7 +706,7 @@ void GLES2DecoderTestBase::DoDeleteFramebuffer(
   EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(service_id)))
       .Times(1)
       .RetiresOnSaturation();
-  DeleteFramebuffers cmd;
+  cmds::DeleteFramebuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   memcpy(shared_memory_address_, &client_id, sizeof(client_id));
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -715,13 +717,14 @@ void GLES2DecoderTestBase::DoBindRenderbuffer(
   EXPECT_CALL(*gl_, BindRenderbufferEXT(target, service_id))
       .Times(1)
       .RetiresOnSaturation();
-  BindRenderbuffer cmd;
+  cmds::BindRenderbuffer cmd;
   cmd.Init(target, client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 bool GLES2DecoderTestBase::DoIsRenderbuffer(GLuint client_id) {
-  return IsObjectHelper<IsRenderbuffer, IsRenderbuffer::Result>(client_id);
+  return IsObjectHelper<cmds::IsRenderbuffer, cmds::IsRenderbuffer::Result>(
+      client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteRenderbuffer(
@@ -729,7 +732,7 @@ void GLES2DecoderTestBase::DoDeleteRenderbuffer(
   EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(service_id)))
       .Times(1)
       .RetiresOnSaturation();
-  DeleteRenderbuffers cmd;
+  cmds::DeleteRenderbuffers cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   memcpy(shared_memory_address_, &client_id, sizeof(client_id));
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -740,13 +743,13 @@ void GLES2DecoderTestBase::DoBindTexture(
   EXPECT_CALL(*gl_, BindTexture(target, service_id))
       .Times(1)
       .RetiresOnSaturation();
-  BindTexture cmd;
+  cmds::BindTexture cmd;
   cmd.Init(target, client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 bool GLES2DecoderTestBase::DoIsTexture(GLuint client_id) {
-  return IsObjectHelper<IsTexture, IsTexture::Result>(client_id);
+  return IsObjectHelper<cmds::IsTexture, cmds::IsTexture::Result>(client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteTexture(
@@ -754,7 +757,7 @@ void GLES2DecoderTestBase::DoDeleteTexture(
   EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id)))
       .Times(1)
       .RetiresOnSaturation();
-  DeleteTextures cmd;
+  cmds::DeleteTextures cmd;
   cmd.Init(1, shared_memory_id_, shared_memory_offset_);
   memcpy(shared_memory_address_, &client_id, sizeof(client_id));
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -775,7 +778,7 @@ void GLES2DecoderTestBase::DoTexImage2D(
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
-  TexImage2D cmd;
+  cmds::TexImage2D cmd;
   cmd.Init(target, level, internal_format, width, height, border, format,
            type, shared_memory_id, shared_memory_offset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -797,7 +800,7 @@ void GLES2DecoderTestBase::DoCompressedTexImage2D(
       .RetiresOnSaturation();
   CommonDecoder::Bucket* bucket = decoder_->CreateBucket(bucket_id);
   bucket->SetSize(size);
-  CompressedTexImage2DBucket cmd;
+  cmds::CompressedTexImage2DBucket cmd;
   cmd.Init(
       target, level, format, width, height, border,
       bucket_id);
@@ -826,7 +829,7 @@ void GLES2DecoderTestBase::DoTexImage2DSameSize(
         .WillOnce(Return(GL_NO_ERROR))
         .RetiresOnSaturation();
   }
-  TexImage2D cmd;
+  cmds::TexImage2D cmd;
   cmd.Init(target, level, internal_format, width, height, border, format,
            type, shared_memory_id, shared_memory_offset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -845,7 +848,7 @@ void GLES2DecoderTestBase::DoRenderbufferStorage(
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(error))
       .RetiresOnSaturation();
-  RenderbufferStorage cmd;
+  cmds::RenderbufferStorage cmd;
   cmd.Init(target, internal_format, width, height);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -864,7 +867,7 @@ void GLES2DecoderTestBase::DoFramebufferTexture2D(
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(error))
       .RetiresOnSaturation();
-  FramebufferTexture2D cmd;
+  cmds::FramebufferTexture2D cmd;
   cmd.Init(target, attachment, textarget, texture_client_id, level);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -886,7 +889,7 @@ void GLES2DecoderTestBase::DoFramebufferRenderbuffer(
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(error))
       .RetiresOnSaturation();
-  FramebufferRenderbuffer cmd;
+  cmds::FramebufferRenderbuffer cmd;
   cmd.Init(target, attachment, renderbuffer_target, renderbuffer_client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -898,7 +901,7 @@ void GLES2DecoderTestBase::DoVertexAttribPointer(
                                   BufferOffset(offset)))
       .Times(1)
       .RetiresOnSaturation();
-  VertexAttribPointer cmd;
+  cmds::VertexAttribPointer cmd;
   cmd.Init(index, size, GL_FLOAT, GL_FALSE, stride, offset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -909,7 +912,7 @@ void GLES2DecoderTestBase::DoVertexAttribDivisorANGLE(
               VertexAttribDivisorANGLE(index, divisor))
       .Times(1)
       .RetiresOnSaturation();
-  VertexAttribDivisorANGLE cmd;
+  cmds::VertexAttribDivisorANGLE cmd;
   cmd.Init(index, divisor);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -1118,7 +1121,7 @@ void GLES2DecoderTestBase::SetupDefaultProgram() {
     EXPECT_CALL(*gl_, UseProgram(kServiceProgramId))
         .Times(1)
         .RetiresOnSaturation();
-    UseProgram cmd;
+    cmds::UseProgram cmd;
     cmd.Init(client_program_id_);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   }
@@ -1152,7 +1155,7 @@ void GLES2DecoderTestBase::SetupCubemapProgram() {
     EXPECT_CALL(*gl_, UseProgram(kServiceProgramId))
         .Times(1)
         .RetiresOnSaturation();
-    UseProgram cmd;
+    cmds::UseProgram cmd;
     cmd.Init(client_program_id_);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   }
@@ -1190,17 +1193,17 @@ void GLES2DecoderTestBase::SetupShader(
       GL_FRAGMENT_SHADER, fragment_shader_client_id,
       fragment_shader_service_id);
 
-  GetShaderInfo(vertex_shader_client_id)->SetStatus(true, "", NULL);
-  GetShaderInfo(fragment_shader_client_id)->SetStatus(true, "", NULL);
+  GetShader(vertex_shader_client_id)->SetStatus(true, "", NULL);
+  GetShader(fragment_shader_client_id)->SetStatus(true, "", NULL);
 
-  AttachShader attach_cmd;
+  cmds::AttachShader attach_cmd;
   attach_cmd.Init(program_client_id, vertex_shader_client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));
 
   attach_cmd.Init(program_client_id, fragment_shader_client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd));
 
-  LinkProgram link_cmd;
+  cmds::LinkProgram link_cmd;
   link_cmd.Init(program_client_id);
 
   EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd));
@@ -1213,7 +1216,7 @@ void GLES2DecoderTestBase::DoEnableVertexAttribArray(GLint index) {
   EXPECT_CALL(*gl_, EnableVertexAttribArray(index))
       .Times(1)
       .RetiresOnSaturation();
-  EnableVertexAttribArray cmd;
+  cmds::EnableVertexAttribArray cmd;
   cmd.Init(index);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -1228,7 +1231,7 @@ void GLES2DecoderTestBase::DoBufferData(GLenum target, GLsizei size) {
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
-  BufferData cmd;
+  cmds::BufferData cmd;
   cmd.Init(target, size, 0, 0, GL_STREAM_DRAW);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
@@ -1240,7 +1243,7 @@ void GLES2DecoderTestBase::DoBufferSubData(
       .Times(1)
       .RetiresOnSaturation();
   memcpy(shared_memory_address_, data, size);
-  BufferSubData cmd;
+  cmds::BufferSubData cmd;
   cmd.Init(target, offset, size, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }