Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/renderbuffer_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/renderbuffer_manager.h"
 
 #include <set>
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 60 matching lines @@
 #endif
 
 TEST_F(RenderbufferManagerTest, Basic) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLuint kClient2Id = 2;
   EXPECT_EQ(kMaxSize, manager_->max_renderbuffer_size());
   EXPECT_EQ(kMaxSamples, manager_->max_samples());
   EXPECT_FALSE(manager_->HaveUnclearedRenderbuffers());
   // Check we can create renderbuffer.
-  manager_->CreateRenderbufferInfo(kClient1Id, kService1Id);
+  manager_->CreateRenderbuffer(kClient1Id, kService1Id);
   // Check renderbuffer got created.
-  RenderbufferManager::RenderbufferInfo* info1 =
-      manager_->GetRenderbufferInfo(kClient1Id);
+  Renderbuffer* info1 =
+      manager_->GetRenderbuffer(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
   EXPECT_FALSE(manager_->HaveUnclearedRenderbuffers());
   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 renderbuffer.
-  EXPECT_TRUE(manager_->GetRenderbufferInfo(kClient2Id) == NULL);
+  EXPECT_TRUE(manager_->GetRenderbuffer(kClient2Id) == NULL);
   // Check trying to a remove non-existent renderbuffers does not crash.
-  manager_->RemoveRenderbufferInfo(kClient2Id);
+  manager_->RemoveRenderbuffer(kClient2Id);
   // Check that the renderbuffer is deleted when the last ref is released.
   EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   // Check we can't get the renderbuffer after we remove it.
-  manager_->RemoveRenderbufferInfo(kClient1Id);
-  EXPECT_TRUE(manager_->GetRenderbufferInfo(kClient1Id) == NULL);
+  manager_->RemoveRenderbuffer(kClient1Id);
+  EXPECT_TRUE(manager_->GetRenderbuffer(kClient1Id) == NULL);
   EXPECT_FALSE(manager_->HaveUnclearedRenderbuffers());
 }
 
 TEST_F(RenderbufferManagerTest, Destroy) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   // Check we can create renderbuffer.
-  manager_->CreateRenderbufferInfo(kClient1Id, kService1Id);
+  manager_->CreateRenderbuffer(kClient1Id, kService1Id);
   // Check renderbuffer got created.
-  RenderbufferManager::RenderbufferInfo* info1 =
-      manager_->GetRenderbufferInfo(kClient1Id);
+  Renderbuffer* info1 =
+      manager_->GetRenderbuffer(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
   EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   manager_->Destroy(true);
-  info1 = manager_->GetRenderbufferInfo(kClient1Id);
+  info1 = manager_->GetRenderbuffer(kClient1Id);
   ASSERT_TRUE(info1 == NULL);
 }
 
-TEST_F(RenderbufferManagerTest, RenderbufferInfo) {
+TEST_F(RenderbufferManagerTest, Renderbuffer) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   // Check we can create renderbuffer.
-  manager_->CreateRenderbufferInfo(kClient1Id, kService1Id);
+  manager_->CreateRenderbuffer(kClient1Id, kService1Id);
   // Check renderbuffer got created.
-  RenderbufferManager::RenderbufferInfo* info1 =
-      manager_->GetRenderbufferInfo(kClient1Id);
+  Renderbuffer* info1 =
+      manager_->GetRenderbuffer(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
   EXPECT_EQ(kService1Id, info1->service_id());
   EXPECT_EQ(0, info1->samples());
   EXPECT_EQ(static_cast<GLenum>(GL_RGBA4), info1->internal_format());
   EXPECT_EQ(0, info1->width());
   EXPECT_EQ(0, info1->height());
   EXPECT_TRUE(info1->cleared());
   EXPECT_EQ(0u, info1->EstimatedSize());
 
   // Check if we set the info it gets marked as not cleared.
@@ skipping 15 matching lines @@
   EXPECT_TRUE(info1->cleared());
   EXPECT_FALSE(manager_->HaveUnclearedRenderbuffers());
 
   manager_->SetInfo(info1, kSamples, kFormat, kWidth, kHeight);
   EXPECT_TRUE(manager_->HaveUnclearedRenderbuffers());
 
   // Check that the renderbuffer is deleted when the last ref is released.
   EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
-  manager_->RemoveRenderbufferInfo(kClient1Id);
+  manager_->RemoveRenderbuffer(kClient1Id);
   EXPECT_FALSE(manager_->HaveUnclearedRenderbuffers());
 }
 
 TEST_F(RenderbufferManagerMemoryTrackerTest, Basic) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   EXPECT_MEMORY_ALLOCATION_CHANGE(0, 0, MemoryTracker::kUnmanaged);
-  manager_->CreateRenderbufferInfo(kClient1Id, kService1Id);
-  RenderbufferManager::RenderbufferInfo* info1 =
-      manager_->GetRenderbufferInfo(kClient1Id);
+  manager_->CreateRenderbuffer(kClient1Id, kService1Id);
+  Renderbuffer* info1 =
+      manager_->GetRenderbuffer(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
 
   const GLsizei kSamples = 4;
   const GLenum kFormat = GL_RGBA4;
   const GLsizei kWidth = 128;
   const GLsizei kHeight1 = 64;
   const GLsizei kHeight2 = 32;
   uint32 expected_size_1 = 0;
   uint32 expected_size_2 = 0;
   RenderbufferManager::ComputeEstimatedRenderbufferSize(
@@ skipping 11 matching lines @@
   EXPECT_MEMORY_ALLOCATION_CHANGE(
       expected_size_2, 0, MemoryTracker::kUnmanaged);
   EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
 }
 
 TEST_F(RenderbufferManagerTest, UseDeletedRenderbufferInfo) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
-  manager_->CreateRenderbufferInfo(kClient1Id, kService1Id);
-  RenderbufferManager::RenderbufferInfo::Ref info1(
-      manager_->GetRenderbufferInfo(kClient1Id));
+  manager_->CreateRenderbuffer(kClient1Id, kService1Id);
+  scoped_refptr<Renderbuffer> info1(
+      manager_->GetRenderbuffer(kClient1Id));
   ASSERT_TRUE(info1 != NULL);
   // Remove it.
-  manager_->RemoveRenderbufferInfo(kClient1Id);
+  manager_->RemoveRenderbuffer(kClient1Id);
   // Use after removing.
   const GLsizei kSamples = 4;
   const GLenum kFormat = GL_RGBA4;
   const GLsizei kWidth = 128;
   const GLsizei kHeight = 64;
   manager_->SetInfo(info1, kSamples, kFormat, kWidth, kHeight);
   // See that it still affects manager.
   EXPECT_TRUE(manager_->HaveUnclearedRenderbuffers());
   manager_->SetCleared(info1, true);
   EXPECT_FALSE(manager_->HaveUnclearedRenderbuffers());
@@ skipping 10 matching lines @@
   std::pair<std::set<std::string>::iterator, bool> result =
       string_set->insert(str);
   return !result.second;
 }
 
 }  // anonymous namespace
 
 TEST_F(RenderbufferManagerTest, AddToSignature) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
-  manager_->CreateRenderbufferInfo(kClient1Id, kService1Id);
-  RenderbufferManager::RenderbufferInfo::Ref info1(
-      manager_->GetRenderbufferInfo(kClient1Id));
+  manager_->CreateRenderbuffer(kClient1Id, kService1Id);
+  scoped_refptr<Renderbuffer> info1(
+      manager_->GetRenderbuffer(kClient1Id));
   ASSERT_TRUE(info1 != NULL);
   const GLsizei kSamples = 4;
   const GLenum kFormat = GL_RGBA4;
   const GLsizei kWidth = 128;
   const GLsizei kHeight = 64;
   manager_->SetInfo(info1, kSamples, kFormat, kWidth, kHeight);
   std::string signature1;
   std::string signature2;
   info1->AddToSignature(&signature1);
 
@@ skipping 31 matching lines @@
 
   EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
 }
 
 }  // namespace gles2
 }  // namespace gpu