Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/gles2_cmd_decoder_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/gles2_cmd_decoder.h"
 
 #include "base/atomicops.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/id_allocator.h"
@@ skipping 29 matching lines @@
 using ::testing::Return;
 using ::testing::SetArrayArgument;
 using ::testing::SetArgumentPointee;
 using ::testing::SetArgPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 
 namespace gpu {
 namespace gles2 {
 
+using namespace cmds;
+
 class GLES2DecoderTest : public GLES2DecoderTestBase {
  public:
   GLES2DecoderTest() { }
 
  protected:
   void CheckReadPixelsOutOfRange(
       GLint in_read_x, GLint in_read_y,
       GLsizei in_read_width, GLsizei in_read_height,
       bool init);
 };
@@ skipping 1748 matching lines @@
       0, 0);
   GenerateMipmap cmd;
   cmd.Init(GL_TEXTURE_2D);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest, GenerateMipmapHandlesOutOfMemory) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   TextureManager* manager = group().texture_manager();
-  TextureManager::TextureInfo* info =
-      manager->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      manager->GetTexture(client_texture_id_);
   ASSERT_TRUE(info != NULL);
   GLint width = 0;
   GLint height = 0;
   EXPECT_FALSE(info->GetLevelSize(GL_TEXTURE_2D, 2, &width, &height));
   DoTexImage2D(
       GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
       kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_CALL(*gl_, TexParameteri(
       GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST))
       .Times(1)
@@ skipping 2883 matching lines @@
   GLenum target = GL_TEXTURE_2D;
   GLint level = 0;
   GLenum internal_format = GL_RGBA;
   GLsizei width = 2;
   GLsizei height = 4;
   GLint border = 0;
   GLenum format = GL_RGBA;
   GLenum type = GL_UNSIGNED_BYTE;
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   TextureManager* manager = group().texture_manager();
-  TextureManager::TextureInfo* info =
-      manager->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      manager->GetTexture(client_texture_id_);
   ASSERT_TRUE(info != NULL);
   EXPECT_FALSE(info->GetLevelSize(GL_TEXTURE_2D, level, &width, &height));
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_OUT_OF_MEMORY))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, TexImage2D(target, level, internal_format,
                                width, height, border, format, type, _))
       .Times(1)
       .RetiresOnSaturation();
   TexImage2D cmd;
   cmd.Init(target, level, internal_format, width, height, border, format,
            type, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_OUT_OF_MEMORY, GetGLError());
   EXPECT_FALSE(info->GetLevelSize(GL_TEXTURE_2D, level, &width, &height));
 }
 
 TEST_F(GLES2DecoderTest, BufferDataGLError) {
   GLenum target = GL_ARRAY_BUFFER;
   GLsizeiptr size = 4;
   DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
   BufferManager* manager = group().buffer_manager();
-  BufferManager::BufferInfo* info =
-      manager->GetBufferInfo(client_buffer_id_);
+  BufferManager::Buffer* info =
+      manager->GetBuffer(client_buffer_id_);
   ASSERT_TRUE(info != NULL);
   EXPECT_EQ(0, info->size());
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_OUT_OF_MEMORY))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, BufferData(target, size, _, GL_STREAM_DRAW))
       .Times(1)
       .RetiresOnSaturation();
   BufferData cmd;
   cmd.Init(target, size, 0, 0, GL_STREAM_DRAW);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_OUT_OF_MEMORY, GetGLError());
   EXPECT_EQ(0, info->size());
 }
 
 TEST_F(GLES2DecoderTest, CopyTexImage2DGLError) {
   GLenum target = GL_TEXTURE_2D;
   GLint level = 0;
   GLenum internal_format = GL_RGBA;
   GLsizei width = 2;
   GLsizei height = 4;
   GLint border = 0;
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   TextureManager* manager = group().texture_manager();
-  TextureManager::TextureInfo* info =
-      manager->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      manager->GetTexture(client_texture_id_);
   ASSERT_TRUE(info != NULL);
   EXPECT_FALSE(info->GetLevelSize(GL_TEXTURE_2D, level, &width, &height));
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_OUT_OF_MEMORY))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, CopyTexImage2D(
       target, level, internal_format, 0, 0, width, height, border))
       .Times(1)
       .RetiresOnSaturation();
@@ skipping 510 matching lines @@
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   // Test CompressedTexSubImage not allowed
   CompressedTexSubImage2DBucket sub_cmd;
   bucket->SetSize(kBlockSize);
   sub_cmd.Init(GL_TEXTURE_2D, 0, 0, 0, 4, 4, kFormat, kBucketId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(sub_cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 
   // Test TexSubImage not allowed for ETC1 compressed texture
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   ASSERT_TRUE(info != NULL);
   GLenum type, internal_format;
   EXPECT_TRUE(info->GetLevelType(GL_TEXTURE_2D, 0, &type, &internal_format));
   EXPECT_EQ(kFormat, internal_format);
   TexSubImage2D texsub_cmd;
   texsub_cmd.Init(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_RGBA, GL_UNSIGNED_BYTE,
            kSharedMemoryId, kSharedMemoryOffset, GL_FALSE);
   EXPECT_EQ(error::kNoError, ExecuteCmd(texsub_cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 
@@ skipping 89 matching lines @@
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_EXTERNAL_OES, kNewServiceId));
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_EXTERNAL_OES, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  TextureManager::TextureInfo* info = GetTextureInfo(kNewClientId);
+  Texture* info = GetTexture(kNewClientId);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_EXTERNAL_OES);
 }
 
 TEST_F(GLES2DecoderManualInitTest, EGLImageExternalGetBinding) {
   InitDecoder(
       "GL_OES_EGL_image_external",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
@@ skipping 29 matching lines @@
       "GL_OES_EGL_image_external",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
   DoBindTexture(GL_TEXTURE_EXTERNAL_OES, client_texture_id_, kServiceTextureId);
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_EXTERNAL_OES);
   EXPECT_TRUE(info->min_filter() == GL_LINEAR);
   EXPECT_TRUE(info->wrap_s() == GL_CLAMP_TO_EDGE);
   EXPECT_TRUE(info->wrap_t() == GL_CLAMP_TO_EDGE);
 }
 
 TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureParam) {
   InitDecoder(
       "GL_OES_EGL_image_external",  // extensions
@@ skipping 37 matching lines @@
            GL_CLAMP_TO_EDGE);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   cmd.Init(GL_TEXTURE_EXTERNAL_OES,
            GL_TEXTURE_WRAP_T,
            GL_CLAMP_TO_EDGE);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_EXTERNAL_OES);
   EXPECT_TRUE(info->min_filter() == GL_LINEAR);
   EXPECT_TRUE(info->wrap_s() == GL_CLAMP_TO_EDGE);
   EXPECT_TRUE(info->wrap_t() == GL_CLAMP_TO_EDGE);
 }
 
 TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureParamInvalid) {
   InitDecoder(
       "GL_OES_EGL_image_external",  // extensions
@@ skipping 19 matching lines @@
            GL_REPEAT);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 
   cmd.Init(GL_TEXTURE_EXTERNAL_OES,
            GL_TEXTURE_WRAP_T,
            GL_REPEAT);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_EXTERNAL_OES);
   EXPECT_TRUE(info->min_filter() == GL_LINEAR);
   EXPECT_TRUE(info->wrap_s() == GL_CLAMP_TO_EDGE);
   EXPECT_TRUE(info->wrap_t() == GL_CLAMP_TO_EDGE);
 }
 
 TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTexImage2DError) {
   InitDecoder(
       "GL_OES_EGL_image_external",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
   GLenum target = GL_TEXTURE_EXTERNAL_OES;
   GLint level = 0;
   GLenum internal_format = GL_RGBA;
   GLsizei width = 2;
   GLsizei height = 4;
   GLint border = 0;
   GLenum format = GL_RGBA;
   GLenum type = GL_UNSIGNED_BYTE;
   DoBindTexture(GL_TEXTURE_EXTERNAL_OES, client_texture_id_, kServiceTextureId);
-  ASSERT_TRUE(GetTextureInfo(client_texture_id_) != NULL);
+  ASSERT_TRUE(GetTexture(client_texture_id_) != NULL);
   TexImage2D cmd;
   cmd.Init(target, level, internal_format, width, height, border, format,
            type, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 
   // TexImage2D is not allowed with GL_TEXTURE_EXTERNAL_OES targets.
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
 TEST_F(GLES2DecoderManualInitTest, BindGeneratesResourceFalse) {
@@ skipping 44 matching lines @@
       .WillOnce(Return(kObjectId))
       .RetiresOnSaturation();
 
   CreateStreamTextureCHROMIUM cmd;
   CreateStreamTextureCHROMIUM::Result* result =
       static_cast<CreateStreamTextureCHROMIUM::Result*>(shared_memory_address_);
   cmd.Init(client_texture_id_, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(kObjectId, *result);
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->IsStreamTexture());
 }
 
 TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMBadId) {
   InitDecoder(
       "GL_CHROMIUM_stream_texture",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
@@ skipping 36 matching lines @@
   InitDecoder(
       "GL_CHROMIUM_stream_texture",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(true);
 
   CreateStreamTextureCHROMIUM cmd;
   cmd.Init(client_texture_id_, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 }
 
 TEST_F(GLES2DecoderManualInitTest, BindStreamTextureCHROMIUM) {
   InitDecoder(
       "GL_CHROMIUM_stream_texture GL_OES_EGL_image_external",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
   StrictMock<MockStreamTextureManager> manager;
   StrictMock<MockStreamTexture> texture;
   decoder_->SetStreamTextureManager(&manager);
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(true);
 
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_EXTERNAL_OES, kServiceTextureId))
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(manager, LookupStreamTexture(kServiceTextureId))
       .WillOnce(Return(&texture))
       .RetiresOnSaturation();
   EXPECT_CALL(texture, Update())
       .Times(1)
       .RetiresOnSaturation();
 
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_EXTERNAL_OES, client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_F(GLES2DecoderManualInitTest, BindStreamTextureCHROMIUMInvalid) {
   InitDecoder(
       "GL_CHROMIUM_stream_texture",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(true);
 
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_2D, client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 
   BindTexture cmd2;
   cmd2.Init(GL_TEXTURE_CUBE_MAP, client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 }
 
 TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUM) {
   InitDecoder(
       "GL_CHROMIUM_stream_texture",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
   StrictMock<MockStreamTextureManager> manager;
   decoder_->SetStreamTextureManager(&manager);
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(true);
 
   EXPECT_CALL(manager, DestroyStreamTexture(kServiceTextureId))
       .Times(1)
       .RetiresOnSaturation();
 
   DestroyStreamTextureCHROMIUM cmd;
   cmd.Init(client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_FALSE(info->IsStreamTexture());
   EXPECT_EQ(0U, info->target());
 }
 
 TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUMInvalid) {
   InitDecoder(
       "GL_CHROMIUM_stream_texture",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(false);
 
   DestroyStreamTextureCHROMIUM cmd;
   cmd.Init(client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
 
 TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUMBadId) {
   InitDecoder(
@@ skipping 21 matching lines @@
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
   CreateStreamTextureCHROMIUM cmd;
   cmd.Init(client_texture_id_, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
   GetGLError(); // ignore internal error
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(true);
 
   DestroyStreamTextureCHROMIUM cmd2;
   cmd2.Init(client_texture_id_);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd2));
   GetGLError(); // ignore internal error
 }
 
 TEST_F(GLES2DecoderManualInitTest, ReCreateStreamTextureCHROMIUM) {
   const GLuint kObjectId = 123;
@@ skipping 18 matching lines @@
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(manager, DestroyStreamTexture(kServiceTextureId))
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(manager, CreateStreamTexture(kServiceTextureId,
                                            client_texture_id_))
       .WillOnce(Return(kObjectId))
       .RetiresOnSaturation();
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   info->SetStreamTexture(true);
 
   DoBindTexture(GL_TEXTURE_EXTERNAL_OES, client_texture_id_, kServiceTextureId);
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   DestroyStreamTextureCHROMIUM cmd;
   cmd.Init(client_texture_id_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_FALSE(info->IsStreamTexture());
@@ skipping 15 matching lines @@
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_RECTANGLE_ARB, kNewServiceId));
   EXPECT_CALL(*gl_, GenTextures(1, _))
      .WillOnce(SetArgumentPointee<1>(kNewServiceId));
   BindTexture cmd;
   cmd.Init(GL_TEXTURE_RECTANGLE_ARB, kNewClientId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  TextureManager::TextureInfo* info = GetTextureInfo(kNewClientId);
+  Texture* info = GetTexture(kNewClientId);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_RECTANGLE_ARB);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleGetBinding) {
   InitDecoder(
       "GL_ARB_texture_rectangle",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
@@ skipping 31 matching lines @@
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
   DoBindTexture(
       GL_TEXTURE_RECTANGLE_ARB, client_texture_id_, kServiceTextureId);
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_RECTANGLE_ARB);
   EXPECT_TRUE(info->min_filter() == GL_LINEAR);
   EXPECT_TRUE(info->wrap_s() == GL_CLAMP_TO_EDGE);
   EXPECT_TRUE(info->wrap_t() == GL_CLAMP_TO_EDGE);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureParam) {
   InitDecoder(
       "GL_ARB_texture_rectangle",  // extensions
@@ skipping 38 matching lines @@
            GL_CLAMP_TO_EDGE);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   cmd.Init(GL_TEXTURE_RECTANGLE_ARB,
            GL_TEXTURE_WRAP_T,
            GL_CLAMP_TO_EDGE);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_RECTANGLE_ARB);
   EXPECT_TRUE(info->min_filter() == GL_LINEAR);
   EXPECT_TRUE(info->wrap_s() == GL_CLAMP_TO_EDGE);
   EXPECT_TRUE(info->wrap_t() == GL_CLAMP_TO_EDGE);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureParamInvalid) {
   InitDecoder(
       "GL_ARB_texture_rectangle",  // extensions
@@ skipping 20 matching lines @@
            GL_REPEAT);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 
   cmd.Init(GL_TEXTURE_RECTANGLE_ARB,
            GL_TEXTURE_WRAP_T,
            GL_REPEAT);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->target() == GL_TEXTURE_RECTANGLE_ARB);
   EXPECT_TRUE(info->min_filter() == GL_LINEAR);
   EXPECT_TRUE(info->wrap_s() == GL_CLAMP_TO_EDGE);
   EXPECT_TRUE(info->wrap_t() == GL_CLAMP_TO_EDGE);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2DError) {
   InitDecoder(
       "GL_ARB_texture_rectangle",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
   GLint level = 0;
   GLenum internal_format = GL_RGBA;
   GLsizei width = 2;
   GLsizei height = 4;
   GLint border = 0;
   GLenum format = GL_RGBA;
   GLenum type = GL_UNSIGNED_BYTE;
   DoBindTexture(
       GL_TEXTURE_RECTANGLE_ARB, client_texture_id_, kServiceTextureId);
-  ASSERT_TRUE(GetTextureInfo(client_texture_id_) != NULL);
+  ASSERT_TRUE(GetTexture(client_texture_id_) != NULL);
   TexImage2D cmd;
   cmd.Init(target, level, internal_format, width, height, border, format,
            type, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 
   // TexImage2D is not allowed with GL_TEXTURE_RECTANGLE_ARB targets.
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest, EnableFeatureCHROMIUMBadBucket) {
@@ skipping 281 matching lines @@
   DrawArrays cmd;
   cmd.Init(GL_TRIANGLES, 0, kNumVertices);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_FRAMEBUFFER_OPERATION, GetGLError());
 }
 
 TEST_F(GLES2DecoderTest, CopyTexImage2DMarksTextureAsCleared) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 
   TextureManager* manager = group().texture_manager();
-  TextureManager::TextureInfo* info =
-      manager->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      manager->GetTexture(client_texture_id_);
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, CopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 1, 1, 0))
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
@@ skipping 40 matching lines @@
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   CompressedTexImage2D cmd;
   cmd.Init(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, 4, 4, 0,
            8, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   TextureManager* manager = group().texture_manager();
-  TextureManager::TextureInfo* info =
-      manager->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      manager->GetTexture(client_texture_id_);
   EXPECT_TRUE(info->SafeToRenderFrom());
 }
 
 TEST_F(GLES2DecoderWithShaderTest, UnClearedAttachmentsGetClearedOnClear) {
   const GLuint kFBOClientTextureId = 4100;
   const GLuint kFBOServiceTextureId = 4101;
 
   // Register a texture id.
   EXPECT_CALL(*gl_, GenTextures(_, _))
       .WillOnce(SetArgumentPointee<1>(kFBOServiceTextureId))
@@ skipping 355 matching lines @@
       GL_RENDERBUFFER, GL_RGBA4, GL_RGBA, 1, 1, GL_NO_ERROR);
   DoFramebufferRenderbuffer(
       GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
       client_renderbuffer_id_, kServiceRenderbufferId, GL_NO_ERROR);
 
 
   if (!bound_fbo) {
     DoBindFramebuffer(GL_FRAMEBUFFER, 0, 0);
   }
 
-  FramebufferManager::FramebufferInfo* framebuffer =
-      framebuffer_manager->GetFramebufferInfo(client_framebuffer_id_);
+  Framebuffer* framebuffer =
+      framebuffer_manager->GetFramebuffer(client_framebuffer_id_);
   ASSERT_TRUE(framebuffer != NULL);
   framebuffer_manager->MarkAsComplete(framebuffer);
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
 
   // Test that renderbufferStorage marks fbo as not complete.
   DoRenderbufferStorage(
       GL_RENDERBUFFER, GL_RGBA4, GL_RGBA, 1, 1, GL_NO_ERROR);
   EXPECT_FALSE(framebuffer_manager->IsComplete(framebuffer));
   framebuffer_manager->MarkAsComplete(framebuffer);
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
@@ skipping 49 matching lines @@
       GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT,
       1, 1, GL_NO_ERROR);
   DoFramebufferRenderbuffer(
       GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
       client_renderbuffer_id_, kServiceRenderbufferId, GL_NO_ERROR);
 
   if (!bound_fbo) {
     DoBindFramebuffer(GL_FRAMEBUFFER, 0, 0);
   }
 
-  FramebufferManager::FramebufferInfo* framebuffer =
-      framebuffer_manager->GetFramebufferInfo(client_framebuffer_id_);
+  Framebuffer* framebuffer =
+      framebuffer_manager->GetFramebuffer(client_framebuffer_id_);
   ASSERT_TRUE(framebuffer != NULL);
   framebuffer_manager->MarkAsComplete(framebuffer);
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
 
   // Test TexImage2D marks fbo as not complete.
   DoTexImage2D(
       GL_TEXTURE_2D, 0, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, 0, 0);
   EXPECT_FALSE(framebuffer_manager->IsComplete(framebuffer));
   framebuffer_manager->MarkAsComplete(framebuffer);
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
@@ skipping 304 matching lines @@
   group().mailbox_manager()->GenerateMailboxName(
       reinterpret_cast<MailboxName*>(mailbox));
 
   memcpy(shared_memory_address_, mailbox, sizeof(mailbox));
 
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   DoTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 3, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                0, 0);
   DoTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, 2, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                0, 0);
-  TextureManager::TextureInfo* info =
-      group().texture_manager()->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      group().texture_manager()->GetTexture(client_texture_id_);
   EXPECT_EQ(kServiceTextureId, info->service_id());
 
   // Assigns and binds new service side texture ID.
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgumentPointee<1>(kNewServiceId))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kNewServiceId))
       .Times(1)
       .RetiresOnSaturation();
 
@@ skipping 557 matching lines @@
 }
 TEST_F(GLES2DecoderEmulatedVertexArraysOESTest,
     BindVertexArrayOESValidArgsNewId) {
   BindVertexArrayOESValidArgsNewId();
 }
 
 TEST_F(GLES2DecoderTest, BindTexImage2DCHROMIUM) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   DoTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 3, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                0, 0);
-  TextureManager::TextureInfo* info =
-      group().texture_manager()->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      group().texture_manager()->GetTexture(client_texture_id_);
   EXPECT_EQ(kServiceTextureId, info->service_id());
 
   group().image_manager()->AddImage(gfx::GLImage::CreateGLImage(0), 1);
   EXPECT_FALSE(group().image_manager()->LookupImage(1) == NULL);
 
   GLsizei width;
   GLsizei height;
   GLenum type;
   GLenum internal_format;
 
@@ skipping 18 matching lines @@
                0, 0);
   EXPECT_TRUE(info->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height));
   // Image should no longer be set.
   EXPECT_TRUE(info->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 }
 
 TEST_F(GLES2DecoderTest, ReleaseTexImage2DCHROMIUM) {
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   DoTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 3, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                0, 0);
-  TextureManager::TextureInfo* info =
-      group().texture_manager()->GetTextureInfo(client_texture_id_);
+  Texture* info =
+      group().texture_manager()->GetTexture(client_texture_id_);
   EXPECT_EQ(kServiceTextureId, info->service_id());
 
   group().image_manager()->AddImage(gfx::GLImage::CreateGLImage(0), 1);
   EXPECT_FALSE(group().image_manager()->LookupImage(1) == NULL);
 
   GLsizei width;
   GLsizei height;
   GLenum type;
   GLenum internal_format;
 
@@ skipping 26 matching lines @@
   InitDecoder(
       "GL_ARB_texture_rectangle",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
       false,   // request stencil
       true);   // bind generates resource
 
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
   EXPECT_TRUE(info != NULL);
   EXPECT_TRUE(info->pool() == GL_TEXTURE_POOL_UNMANAGED_CHROMIUM);
 
   DoBindTexture(
       GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 
   TexParameteri cmd;
   cmd.Init(GL_TEXTURE_2D,
            GL_TEXTURE_POOL_CHROMIUM,
            GL_TEXTURE_POOL_UNMANAGED_CHROMIUM);
@@ skipping 17 matching lines @@
 
 TEST_F(GLES2DecoderManualInitTest, AsyncPixelTransfers) {
   InitDecoder(
       "GL_CHROMIUM_async_pixel_transfers",  // extensions
       false, false, false,  // has alpha/depth/stencil
       false, false, false,  // request alpha/depth/stencil
       true);   // bind generates resource
 
   // Set up the texture.
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
-  TextureManager::TextureInfo* info = GetTextureInfo(client_texture_id_);
+  Texture* info = GetTexture(client_texture_id_);
 
   // Set a mock Async delegate
   // Async state is returned as a scoped_ptr, but we keep a raw copy.
   StrictMock<gfx::MockAsyncPixelTransferDelegate>* delegate =
       new StrictMock<gfx::MockAsyncPixelTransferDelegate>;
   decoder_->SetAsyncPixelTransferDelegate(delegate);
   StrictMock<gfx::MockAsyncPixelTransferState>* state = NULL;
 
   // Tex(Sub)Image2D upload commands.
   AsyncTexImage2DCHROMIUM teximage_cmd;
@@ skipping 395 matching lines @@
 // TODO(gman): TexImage2DImmediate
 
 // TODO(gman): TexSubImage2DImmediate
 
 // TODO(gman): UseProgram
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu