Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/vertex_attrib_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/vertex_attrib_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 31 matching lines @@
   }
 
   virtual void TearDown() {
     manager_ = NULL;
     ::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_;
-  VertexAttribManager::Ref manager_;
+  scoped_refptr<VertexAttribManager> manager_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const uint32 VertexAttribManagerTest::kNumVertexAttribs;
 #endif
 
 TEST_F(VertexAttribManagerTest, Basic) {
-  EXPECT_TRUE(manager_->GetVertexAttribInfo(kNumVertexAttribs) == NULL);
+  EXPECT_TRUE(manager_->GetVertexAttrib(kNumVertexAttribs) == NULL);
   EXPECT_FALSE(manager_->HaveFixedAttribs());
 
   const VertexAttribManager::VertexAttribInfoList& infos =
       manager_->GetEnabledVertexAttribInfos();
   EXPECT_EQ(0u, infos.size());
 
   for (uint32 ii = 0; ii < kNumVertexAttribs; ii += kNumVertexAttribs - 1) {
-    VertexAttribManager::VertexAttribInfo* info =
-        manager_->GetVertexAttribInfo(ii);
+    VertexAttrib* info =
+        manager_->GetVertexAttrib(ii);
     ASSERT_TRUE(info != NULL);
     EXPECT_EQ(ii, info->index());
     EXPECT_TRUE(info->buffer() == NULL);
     EXPECT_EQ(0, info->offset());
     EXPECT_EQ(4, info->size());
     EXPECT_EQ(static_cast<GLenum>(GL_FLOAT), info->type());
     EXPECT_EQ(GL_FALSE, info->normalized());
     EXPECT_EQ(0, info->gl_stride());
     EXPECT_FALSE(info->enabled());
     manager_->Enable(ii, true);
     EXPECT_TRUE(info->enabled());
   }
 }
 
 TEST_F(VertexAttribManagerTest, Enable) {
   const VertexAttribManager::VertexAttribInfoList& infos =
       manager_->GetEnabledVertexAttribInfos();
 
-  VertexAttribManager::VertexAttribInfo* info1 =
-      manager_->GetVertexAttribInfo(1);
-  VertexAttribManager::VertexAttribInfo* info2 =
-      manager_->GetVertexAttribInfo(3);
+  VertexAttrib* info1 =
+      manager_->GetVertexAttrib(1);
+  VertexAttrib* info2 =
+      manager_->GetVertexAttrib(3);
 
   manager_->Enable(1, true);
   ASSERT_EQ(1u, infos.size());
   EXPECT_TRUE(info1->enabled());
   manager_->Enable(3, true);
   ASSERT_EQ(2u, infos.size());
   EXPECT_TRUE(info2->enabled());
 
   manager_->Enable(1, false);
   ASSERT_EQ(1u, infos.size());
   EXPECT_FALSE(info1->enabled());
 
   manager_->Enable(3, false);
   ASSERT_EQ(0u, infos.size());
   EXPECT_FALSE(info2->enabled());
 }
 
 TEST_F(VertexAttribManagerTest, SetAttribInfo) {
   BufferManager buffer_manager(NULL);
-  buffer_manager.CreateBufferInfo(1, 2);
-  BufferManager::BufferInfo* buffer = buffer_manager.GetBufferInfo(1);
+  buffer_manager.CreateBuffer(1, 2);
+  BufferManager::Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
 
-  VertexAttribManager::VertexAttribInfo* info =
-      manager_->GetVertexAttribInfo(1);
+  VertexAttrib* info =
+      manager_->GetVertexAttrib(1);
 
   manager_->SetAttribInfo(1, buffer, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
 
   EXPECT_EQ(buffer, info->buffer());
   EXPECT_EQ(4, info->offset());
   EXPECT_EQ(3, info->size());
   EXPECT_EQ(static_cast<GLenum>(GL_SHORT), info->type());
   EXPECT_EQ(GL_TRUE, info->normalized());
   EXPECT_EQ(32, info->gl_stride());
 
@@ skipping 10 matching lines @@
   manager_->SetAttribInfo(3, NULL, 4, GL_FIXED, GL_FALSE, 0, 16, 0);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
   manager_->SetAttribInfo(1, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_TRUE(manager_->HaveFixedAttribs());
   manager_->SetAttribInfo(3, NULL, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_FALSE(manager_->HaveFixedAttribs());
 }
 
 TEST_F(VertexAttribManagerTest, CanAccess) {
   BufferManager buffer_manager(NULL);
-  buffer_manager.CreateBufferInfo(1, 2);
-  BufferManager::BufferInfo* buffer = buffer_manager.GetBufferInfo(1);
+  buffer_manager.CreateBuffer(1, 2);
+  BufferManager::Buffer* buffer = buffer_manager.GetBuffer(1);
   ASSERT_TRUE(buffer != NULL);
 
-  VertexAttribManager::VertexAttribInfo* info =
-      manager_->GetVertexAttribInfo(1);
+  VertexAttrib* info =
+      manager_->GetVertexAttrib(1);
 
   EXPECT_TRUE(info->CanAccess(0));
   manager_->Enable(1, true);
   EXPECT_FALSE(info->CanAccess(0));
 
   manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
   EXPECT_FALSE(info->CanAccess(0));
 
   EXPECT_TRUE(buffer_manager.SetTarget(buffer, GL_ARRAY_BUFFER));
   buffer_manager.SetInfo(buffer, 15, GL_STATIC_DRAW);
@@ skipping 16 matching lines @@
   EXPECT_FALSE(info->CanAccess(1));
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
 TEST_F(VertexAttribManagerTest, Unbind) {
   BufferManager buffer_manager(NULL);
-  buffer_manager.CreateBufferInfo(1, 2);
-  buffer_manager.CreateBufferInfo(3, 4);
-  BufferManager::BufferInfo* buffer1 = buffer_manager.GetBufferInfo(1);
-  BufferManager::BufferInfo* buffer2 = buffer_manager.GetBufferInfo(3);
+  buffer_manager.CreateBuffer(1, 2);
+  buffer_manager.CreateBuffer(3, 4);
+  BufferManager::Buffer* buffer1 = buffer_manager.GetBuffer(1);
+  BufferManager::Buffer* buffer2 = buffer_manager.GetBuffer(3);
   ASSERT_TRUE(buffer1 != NULL);
   ASSERT_TRUE(buffer2 != NULL);
 
-  VertexAttribManager::VertexAttribInfo* info1 =
-      manager_->GetVertexAttribInfo(1);
-  VertexAttribManager::VertexAttribInfo* info3 =
-      manager_->GetVertexAttribInfo(3);
+  VertexAttrib* info1 =
+      manager_->GetVertexAttrib(1);
+  VertexAttrib* info3 =
+      manager_->GetVertexAttrib(3);
 
   // Attach to 2 buffers.
   manager_->SetAttribInfo(1, buffer1, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
   manager_->SetAttribInfo(3, buffer1, 3, GL_SHORT, GL_TRUE, 32, 32, 4);
   // Check they were attached.
   EXPECT_EQ(buffer1, info1->buffer());
   EXPECT_EQ(buffer1, info3->buffer());
   // Unbind unattached buffer.
   manager_->Unbind(buffer2);
   // Should be no-op.
   EXPECT_EQ(buffer1, info1->buffer());
   EXPECT_EQ(buffer1, info3->buffer());
   // Unbind buffer.
   manager_->Unbind(buffer1);
   // Check they were detached
   EXPECT_TRUE(NULL == info1->buffer());
   EXPECT_TRUE(NULL == info3->buffer());
 
   // The VertexAttribManager must be destroyed before the BufferManager
   // so it releases its buffers.
   manager_ = NULL;
   buffer_manager.Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu