Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ skipping 80 matching lines @@
   template <typename T>
   T GetSharedMemoryAsWithOffset(uint32 offset) {
     void* ptr = reinterpret_cast<int8*>(shared_memory_address_) + offset;
     return reinterpret_cast<T>(ptr);
   }
 
   IdAllocatorInterface* GetIdAllocator(GLuint namespace_id) {
     return group_->GetIdAllocator(namespace_id);
   }
 
-  BufferManager::BufferInfo* GetBufferInfo(GLuint service_id) {
-    return group_->buffer_manager()->GetBufferInfo(service_id);
+  BufferManager::Buffer* GetBuffer(GLuint service_id) {
+    return group_->buffer_manager()->GetBuffer(service_id);
   }
 
-  FramebufferManager::FramebufferInfo* GetFramebufferInfo(GLuint service_id) {
-    return group_->framebuffer_manager()->GetFramebufferInfo(service_id);
+  Framebuffer* GetFramebuffer(GLuint service_id) {
+    return group_->framebuffer_manager()->GetFramebuffer(service_id);
   }
 
-  RenderbufferManager::RenderbufferInfo* GetRenderbufferInfo(
+  Renderbuffer* GetRenderbuffer(
       GLuint service_id) {
-    return group_->renderbuffer_manager()->GetRenderbufferInfo(service_id);
+    return group_->renderbuffer_manager()->GetRenderbuffer(service_id);
   }
 
-  TextureManager::TextureInfo* GetTextureInfo(GLuint client_id) {
-    return group_->texture_manager()->GetTextureInfo(client_id);
+  Texture* GetTexture(GLuint client_id) {
+    return group_->texture_manager()->GetTexture(client_id);
   }
 
-  ShaderManager::ShaderInfo* GetShaderInfo(GLuint client_id) {
-    return group_->shader_manager()->GetShaderInfo(client_id);
+  Shader* GetShader(GLuint client_id) {
+    return group_->shader_manager()->GetShader(client_id);
   }
 
-  ProgramManager::ProgramInfo* GetProgramInfo(GLuint client_id) {
-    return group_->program_manager()->GetProgramInfo(client_id);
+  Program* GetProgram(GLuint client_id) {
+    return group_->program_manager()->GetProgram(client_id);
   }
 
   QueryManager::Query* GetQueryInfo(GLuint client_id) {
     return decoder_->GetQueryManager()->GetQuery(client_id);
   }
 
   // This name doesn't match the underlying function, but doing it this way
   // prevents the need to special-case the unit test generation
   VertexAttribManager* GetVertexArrayInfo(GLuint client_id) {
     return decoder_->GetVertexArrayManager()->GetVertexAttribManager(client_id);
@@ skipping 386 matching lines @@
 
    private:
     scoped_array<int8> data_;
     Buffer valid_buffer_;
     Buffer invalid_buffer_;
   };
 
   void AddExpectationsForVertexAttribManager();
 
   scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_;
-  ContextGroup::Ref group_;
+  scoped_refptr<ContextGroup> group_;
 };
 
 class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase {
  public:
   GLES2DecoderWithShaderTestBase()
       : GLES2DecoderTestBase() {
   }
 
  protected:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_