Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/framebuffer_manager_unittest.cc

Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index e7f8467528beb122a4e6599eab2ad7542eb8b9d3..a9ba93e812bdacf8abfe2e5c69961660bef03996 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -62,10 +62,10 @@ TEST_F(FramebufferManagerTest, Basic) {
   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());
@@ -73,33 +73,33 @@ TEST_F(FramebufferManagerTest, Basic) {
   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);
 }
 
@@ -129,8 +129,8 @@ class FramebufferInfoTest : public testing::Test {
   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);
   }
 
@@ -142,7 +142,7 @@ class FramebufferInfoTest : public testing::Test {
   // 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_;
 };
@@ -204,10 +204,10 @@ TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
   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
@@ -238,10 +238,10 @@ TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
   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));
@@ -276,10 +276,10 @@ TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
   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);
@@ -304,7 +304,7 @@ TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
             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());
@@ -322,10 +322,10 @@ TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
   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);
@@ -415,9 +415,9 @@ TEST_F(FramebufferInfoTest, AttachTexture) {
   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
@@ -452,7 +452,7 @@ TEST_F(FramebufferInfoTest, AttachTexture) {
   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());
@@ -462,9 +462,9 @@ TEST_F(FramebufferInfoTest, AttachTexture) {
   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(
@@ -524,15 +524,15 @@ TEST_F(FramebufferInfoTest, UnbindRenderbuffer) {
   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.
@@ -561,13 +561,13 @@ TEST_F(FramebufferInfoTest, UnbindTexture) {
   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.
@@ -596,14 +596,14 @@ TEST_F(FramebufferInfoTest, IsCompleteMarkAsComplete) {
   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.
@@ -640,14 +640,14 @@ TEST_F(FramebufferInfoTest, Gettatus) {
   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);