Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/framebuffer_manager_unittest.cc

 // 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.
 
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/feature_info.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
@@ skipping 44 matching lines @@
 const GLint FramebufferManagerTest::kMaxTextureSize;
 const GLint FramebufferManagerTest::kMaxCubemapSize;
 const GLint FramebufferManagerTest::kMaxRenderbufferSize;
 #endif
 
 TEST_F(FramebufferManagerTest, Basic) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLuint kClient2Id = 2;
   // Check we can create framebuffer.
-  manager_.CreateFramebufferInfo(kClient1Id, kService1Id);
+  manager_.CreateFramebuffer(kClient1Id, kService1Id);
   // Check framebuffer got created.
-  FramebufferManager::FramebufferInfo* info1 =
-      manager_.GetFramebufferInfo(kClient1Id);
+  Framebuffer* info1 =
+      manager_.GetFramebuffer(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
   EXPECT_FALSE(info1->IsDeleted());
   EXPECT_EQ(kService1Id, info1->service_id());
   GLuint client_id = 0;
   EXPECT_TRUE(manager_.GetClientId(info1->service_id(), &client_id));
   EXPECT_EQ(kClient1Id, client_id);
   // Check we get nothing for a non-existent framebuffer.
-  EXPECT_TRUE(manager_.GetFramebufferInfo(kClient2Id) == NULL);
+  EXPECT_TRUE(manager_.GetFramebuffer(kClient2Id) == NULL);
   // Check trying to a remove non-existent framebuffers does not crash.
-  manager_.RemoveFramebufferInfo(kClient2Id);
+  manager_.RemoveFramebuffer(kClient2Id);
   // Check framebuffer gets deleted when last reference is released.
   EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   // Check we can't get the framebuffer after we remove it.
-  manager_.RemoveFramebufferInfo(kClient1Id);
-  EXPECT_TRUE(manager_.GetFramebufferInfo(kClient1Id) == NULL);
+  manager_.RemoveFramebuffer(kClient1Id);
+  EXPECT_TRUE(manager_.GetFramebuffer(kClient1Id) == NULL);
 }
 
 TEST_F(FramebufferManagerTest, Destroy) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   // Check we can create framebuffer.
-  manager_.CreateFramebufferInfo(kClient1Id, kService1Id);
+  manager_.CreateFramebuffer(kClient1Id, kService1Id);
   // Check framebuffer got created.
-  FramebufferManager::FramebufferInfo* info1 =
-      manager_.GetFramebufferInfo(kClient1Id);
+  Framebuffer* info1 =
+      manager_.GetFramebuffer(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
   EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   manager_.Destroy(true);
   // Check the resources were released.
-  info1 = manager_.GetFramebufferInfo(kClient1Id);
+  info1 = manager_.GetFramebuffer(kClient1Id);
   ASSERT_TRUE(info1 == NULL);
 }
 
 class FramebufferInfoTest : public testing::Test {
  public:
   static const GLuint kClient1Id = 1;
   static const GLuint kService1Id = 11;
 
   static const GLint kMaxTextureSize = 64;
   static const GLint kMaxCubemapSize = 64;
   static const GLint kMaxRenderbufferSize = 64;
   static const GLint kMaxSamples = 4;
 
   FramebufferInfoTest()
       : manager_(),
         texture_manager_(
           NULL, new FeatureInfo(), kMaxTextureSize, kMaxCubemapSize),
         renderbuffer_manager_(NULL, kMaxRenderbufferSize, kMaxSamples) {
   }
   virtual ~FramebufferInfoTest() {
     manager_.Destroy(false);
     texture_manager_.Destroy(false);
     renderbuffer_manager_.Destroy(false);
   }
 
  protected:
   virtual void SetUp() {
     gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
     ::gfx::GLInterface::SetGLInterface(gl_.get());
-    manager_.CreateFramebufferInfo(kClient1Id, kService1Id);
-    info_ = manager_.GetFramebufferInfo(kClient1Id);
+    manager_.CreateFramebuffer(kClient1Id, kService1Id);
+    info_ = manager_.GetFramebuffer(kClient1Id);
     ASSERT_TRUE(info_ != NULL);
   }
 
   virtual void TearDown() {
     ::gfx::GLInterface::SetGLInterface(NULL);
     gl_.reset();
   }
 
   // Use StrictMock to make 100% sure we know how GL will be called.
   scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   FramebufferManager manager_;
-  FramebufferManager::FramebufferInfo* info_;
+  Framebuffer* info_;
   TextureManager texture_manager_;
   RenderbufferManager renderbuffer_manager_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const GLuint FramebufferInfoTest::kClient1Id;
 const GLuint FramebufferInfoTest::kService1Id;
 const GLint FramebufferInfoTest::kMaxTextureSize;
 const GLint FramebufferInfoTest::kMaxCubemapSize;
@@ skipping 41 matching lines @@
   const GLsizei kWidth4 = 16;
   const GLsizei kHeight4 = 32;
   const GLenum kFormat4 = GL_STENCIL_INDEX8;
   const GLsizei kSamples4 = 0;
 
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
 
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
-  RenderbufferManager::RenderbufferInfo* rb_info1 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient1Id);
+  Renderbuffer* rb_info1 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(rb_info1 != NULL);
 
   // check adding one attachment
   info_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, rb_info1);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_RGBA4), info_->GetColorAttachmentFormat());
   EXPECT_FALSE(info_->HasDepthAttachment());
   EXPECT_FALSE(info_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
@@ skipping 10 matching lines @@
   renderbuffer_manager_.SetInfo(
       rb_info1, kSamples1, kFormat1, kWidth1, kHeight1);
   EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
   EXPECT_FALSE(info_->HasDepthAttachment());
   EXPECT_FALSE(info_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             info_->IsPossiblyComplete());
   EXPECT_FALSE(info_->IsCleared());
 
   // check adding another
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient2Id, kRenderbufferService2Id);
-  RenderbufferManager::RenderbufferInfo* rb_info2 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient2Id);
+  Renderbuffer* rb_info2 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient2Id);
   ASSERT_TRUE(rb_info2 != NULL);
   info_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, rb_info2);
   EXPECT_TRUE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
   EXPECT_TRUE(info_->HasDepthAttachment());
   EXPECT_FALSE(info_->HasStencilAttachment());
   // The attachment has a size of 0,0 so depending on the order of the map
   // of attachments it could either get INCOMPLETE_ATTACHMENT because it's 0,0
   // or INCOMPLETE_DIMENSIONS because it's not the same size as the other
@@ skipping 14 matching lines @@
   // check marking them as cleared.
   manager_.MarkAttachmentsAsCleared(
       info_, &renderbuffer_manager_, &texture_manager_);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             info_->IsPossiblyComplete());
   EXPECT_TRUE(info_->IsCleared());
 
   // Check adding one that is already cleared.
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient3Id, kRenderbufferService3Id);
-  RenderbufferManager::RenderbufferInfo* rb_info3 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient3Id);
+  Renderbuffer* rb_info3 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient3Id);
   ASSERT_TRUE(rb_info3 != NULL);
   renderbuffer_manager_.SetInfo(
       rb_info3, kSamples3, kFormat3, kWidth3, kHeight3);
   renderbuffer_manager_.SetCleared(rb_info3, true);
 
   info_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, rb_info3);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
   EXPECT_TRUE(info_->HasDepthAttachment());
   EXPECT_TRUE(info_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             info_->IsPossiblyComplete());
   EXPECT_TRUE(info_->IsCleared());
 
   // Check marking the renderbuffer as unclared.
   renderbuffer_manager_.SetInfo(
       rb_info1, kSamples1, kFormat1, kWidth1, kHeight1);
   EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
   EXPECT_TRUE(info_->HasDepthAttachment());
   EXPECT_TRUE(info_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             info_->IsPossiblyComplete());
   EXPECT_FALSE(info_->IsCleared());
 
-  const FramebufferManager::FramebufferInfo::Attachment* attachment =
+  const Framebuffer::Attachment* attachment =
       info_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
 
   EXPECT_TRUE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
 
   // Clear it.
   manager_.MarkAttachmentsAsCleared(
       info_, &renderbuffer_manager_, &texture_manager_);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(info_->IsCleared());
 
   // Check replacing an attachment
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient4Id, kRenderbufferService4Id);
-  RenderbufferManager::RenderbufferInfo* rb_info4 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient4Id);
+  Renderbuffer* rb_info4 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient4Id);
   ASSERT_TRUE(rb_info4 != NULL);
   renderbuffer_manager_.SetInfo(
       rb_info4, kSamples4, kFormat4, kWidth4, kHeight4);
 
   info_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, rb_info4);
   EXPECT_TRUE(info_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(info_->IsCleared());
 
   attachment = info_->GetAttachment(GL_STENCIL_ATTACHMENT);
   ASSERT_TRUE(attachment != NULL);
@@ skipping 69 matching lines @@
   const GLint kLevel3 = 0;
   const GLenum kFormat3 = GL_RGB565;
   const GLsizei kSamples3 = 0;
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             info_->IsPossiblyComplete());
 
-  texture_manager_.CreateTextureInfo(kTextureClient1Id, kTextureService1Id);
-  TextureManager::TextureInfo::Ref tex_info1 =
-      texture_manager_.GetTextureInfo(kTextureClient1Id);
+  texture_manager_.CreateTexture(kTextureClient1Id, kTextureService1Id);
+  scoped_refptr<Texture> tex_info1(
+      texture_manager_.GetTexture(kTextureClient1Id));
   ASSERT_TRUE(tex_info1 != NULL);
 
   // check adding one attachment
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, tex_info1, kTarget1, kLevel1);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             info_->IsPossiblyComplete());
   EXPECT_TRUE(info_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(0), info_->GetColorAttachmentFormat());
 
@@ skipping 14 matching lines @@
             info_->IsPossiblyComplete());
   EXPECT_FALSE(info_->IsCleared());
   texture_manager_.SetLevelInfo(
       tex_info1, GL_TEXTURE_2D, kLevel1,
       kFormat1, kWidth1, kHeight1, kDepth, kBorder, kFormat1, kType, true);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             info_->IsPossiblyComplete());
   EXPECT_TRUE(info_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
 
-  const FramebufferManager::FramebufferInfo::Attachment* attachment =
+  const Framebuffer::Attachment* attachment =
       info_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check replacing an attachment
-  texture_manager_.CreateTextureInfo(kTextureClient2Id, kTextureService2Id);
-  TextureManager::TextureInfo::Ref tex_info2 =
-      texture_manager_.GetTextureInfo(kTextureClient2Id);
+  texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
+  scoped_refptr<Texture> tex_info2(
+      texture_manager_.GetTexture(kTextureClient2Id));
   ASSERT_TRUE(tex_info2 != NULL);
   texture_manager_.SetInfoTarget(tex_info2, GL_TEXTURE_2D);
   texture_manager_.SetLevelInfo(
       tex_info2, GL_TEXTURE_2D, kLevel2,
       kFormat2, kWidth2, kHeight2, kDepth, kBorder, kFormat2, kType, true);
 
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, tex_info2, kTarget2, kLevel2);
   EXPECT_EQ(static_cast<GLenum>(kFormat2), info_->GetColorAttachmentFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             info_->IsPossiblyComplete());
@@ skipping 39 matching lines @@
             info_->IsPossiblyComplete());
   EXPECT_TRUE(info_->IsCleared());
 }
 
 TEST_F(FramebufferInfoTest, UnbindRenderbuffer) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
   const GLuint kRenderbufferService2Id = 334;
 
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
-  RenderbufferManager::RenderbufferInfo* rb_info1 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient1Id);
+  Renderbuffer* rb_info1 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(rb_info1 != NULL);
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient2Id, kRenderbufferService2Id);
-  RenderbufferManager::RenderbufferInfo* rb_info2 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient2Id);
+  Renderbuffer* rb_info2 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient2Id);
   ASSERT_TRUE(rb_info2 != NULL);
 
   // Attach to 2 attachment points.
   info_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, rb_info1);
   info_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, rb_info1);
   // Check they were attached.
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
   EXPECT_TRUE(info_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
   // Unbind unattached renderbuffer.
   info_->UnbindRenderbuffer(GL_RENDERBUFFER, rb_info2);
   // Should be no-op.
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
   EXPECT_TRUE(info_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
   // Unbind renderbuffer.
   info_->UnbindRenderbuffer(GL_RENDERBUFFER, rb_info1);
   // Check they were detached
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_TRUE(info_->GetAttachment(GL_DEPTH_ATTACHMENT) == NULL);
 }
 
 TEST_F(FramebufferInfoTest, UnbindTexture) {
   const GLuint kTextureClient1Id = 33;
   const GLuint kTextureService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
 
-  texture_manager_.CreateTextureInfo(kTextureClient1Id, kTextureService1Id);
-  TextureManager::TextureInfo::Ref tex_info1 =
-      texture_manager_.GetTextureInfo(kTextureClient1Id);
+  texture_manager_.CreateTexture(kTextureClient1Id, kTextureService1Id);
+  scoped_refptr<Texture> tex_info1(
+      texture_manager_.GetTexture(kTextureClient1Id));
   ASSERT_TRUE(tex_info1 != NULL);
-  texture_manager_.CreateTextureInfo(kTextureClient2Id, kTextureService2Id);
-  TextureManager::TextureInfo::Ref tex_info2 =
-      texture_manager_.GetTextureInfo(kTextureClient2Id);
+  texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
+  scoped_refptr<Texture> tex_info2(
+      texture_manager_.GetTexture(kTextureClient2Id));
   ASSERT_TRUE(tex_info2 != NULL);
 
   // Attach to 2 attachment points.
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, tex_info1, kTarget1, kLevel1);
   info_->AttachTexture(GL_DEPTH_ATTACHMENT, tex_info1, kTarget1, kLevel1);
   // Check they were attached.
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
   EXPECT_TRUE(info_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
   // Unbind unattached texture.
   info_->UnbindTexture(kTarget1, tex_info2);
   // Should be no-op.
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
   EXPECT_TRUE(info_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
   // Unbind texture.
   info_->UnbindTexture(kTarget1, tex_info1);
   // Check they were detached
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_TRUE(info_->GetAttachment(GL_DEPTH_ATTACHMENT) == NULL);
 }
 
 TEST_F(FramebufferInfoTest, IsCompleteMarkAsComplete) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
 
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
-  RenderbufferManager::RenderbufferInfo* rb_info1 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient1Id);
+  Renderbuffer* rb_info1 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(rb_info1 != NULL);
-  texture_manager_.CreateTextureInfo(kTextureClient2Id, kTextureService2Id);
-  TextureManager::TextureInfo::Ref tex_info2 =
-      texture_manager_.GetTextureInfo(kTextureClient2Id);
+  texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
+  scoped_refptr<Texture> tex_info2(
+      texture_manager_.GetTexture(kTextureClient2Id));
   ASSERT_TRUE(tex_info2 != NULL);
 
   // Check MarkAsComlete marks as complete.
   manager_.MarkAsComplete(info_);
   EXPECT_TRUE(manager_.IsComplete(info_));
 
   // Check at attaching marks as not complete.
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, tex_info2, kTarget1, kLevel1);
   EXPECT_FALSE(manager_.IsComplete(info_));
   manager_.MarkAsComplete(info_);
@@ skipping 16 matching lines @@
 }
 
 TEST_F(FramebufferInfoTest, Gettatus) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
 
-  renderbuffer_manager_.CreateRenderbufferInfo(
+  renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
-  RenderbufferManager::RenderbufferInfo* rb_info1 =
-      renderbuffer_manager_.GetRenderbufferInfo(kRenderbufferClient1Id);
+  Renderbuffer* rb_info1 =
+      renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(rb_info1 != NULL);
-  texture_manager_.CreateTextureInfo(kTextureClient2Id, kTextureService2Id);
-  TextureManager::TextureInfo::Ref tex_info2 =
-      texture_manager_.GetTextureInfo(kTextureClient2Id);
+  texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
+  scoped_refptr<Texture> tex_info2(
+      texture_manager_.GetTexture(kTextureClient2Id));
   ASSERT_TRUE(tex_info2 != NULL);
   texture_manager_.SetInfoTarget(tex_info2, GL_TEXTURE_2D);
 
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   info_->GetStatus(&texture_manager_, GL_FRAMEBUFFER);
 
   // Check a second call for the same type does not call anything
   info_->GetStatus(&texture_manager_, GL_FRAMEBUFFER);
@@ skipping 46 matching lines @@
 
   // Check Unbinding does not call CheckFramebufferStatus
   info_->UnbindRenderbuffer(GL_RENDERBUFFER, rb_info1);
   info_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER);
 }
 
 }  // namespace gles2
 }  // namespace gpu