Add reference-counting for mailbox textures.

gpu/command_buffer/service/texture_manager_unittest.cc

Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index ca3bf716c89b757a10a9f9f13b1ed0946d0410ae..64296a44e9666d6b5daeee86ac74afcd65829159 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -1385,7 +1385,7 @@ TEST_F(SaveRestoreTextureTest, SaveRestore2D) {
   EXPECT_TRUE(texture_->texture_complete());
   LevelInfo level1 = GetLevelInfo(texture_.get(), GL_TEXTURE_2D, 1);
   LevelInfo level2 = GetLevelInfo(texture_.get(), GL_TEXTURE_2D, 2);
-  scoped_ptr<TextureDefinition> definition(Save(texture_));
+  TextureDefinition* definition(Save(texture_));
   const TextureDefinition::LevelInfos& infos = definition->level_infos();
   EXPECT_EQ(1U, infos.size());
   EXPECT_EQ(3U, infos[0].size());
@@ -1400,7 +1400,7 @@ TEST_F(SaveRestoreTextureTest, SaveRestore2D) {
   EXPECT_TRUE(manager_->MarkMipmapsGenerated(texture2_));
   EXPECT_TRUE(texture2_->texture_complete());
   EXPECT_EQ(1024U + 256U + 64U + 16U + 4U, texture2_->estimated_size());
-  Restore(texture2_, definition.release());
+  Restore(texture2_, definition);
   EXPECT_EQ(level0, GetLevelInfo(texture2_.get(), GL_TEXTURE_2D, 0));
   EXPECT_EQ(level1, GetLevelInfo(texture2_.get(), GL_TEXTURE_2D, 1));
   EXPECT_EQ(level2, GetLevelInfo(texture2_.get(), GL_TEXTURE_2D, 2));
@@ -1418,13 +1418,13 @@ TEST_F(SaveRestoreTextureTest, SaveRestoreClearRectangle) {
       GL_TEXTURE_RECTANGLE_ARB, GL_RGBA, 1, 1, 1, 0, GL_UNSIGNED_BYTE, false);
   SetLevelInfo(texture_, 0, level0);
   EXPECT_TRUE(texture_->texture_complete());
-  scoped_ptr<TextureDefinition> definition(Save(texture_));
+  TextureDefinition* definition(Save(texture_));
   const TextureDefinition::LevelInfos& infos = definition->level_infos();
   EXPECT_EQ(1U, infos.size());
   EXPECT_EQ(1U, infos[0].size());
   EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_RECTANGLE_ARB), infos[0][0].target);
   manager_->SetTarget(texture2_, GL_TEXTURE_RECTANGLE_ARB);
-  Restore(texture2_, definition.release());
+  Restore(texture2_, definition);
 
   // See if we can clear the previously uncleared level now.
   EXPECT_EQ(level0, GetLevelInfo(texture2_.get(), GL_TEXTURE_RECTANGLE_ARB, 0));
@@ -1456,12 +1456,12 @@ TEST_F(SaveRestoreTextureTest, SaveRestoreCube) {
   SetLevelInfo(texture_, 0, face0);
   SetLevelInfo(texture_, 0, face5);
   EXPECT_TRUE(texture_->texture_complete());
-  scoped_ptr<TextureDefinition> definition(Save(texture_));
+  TextureDefinition* definition(Save(texture_));
   const TextureDefinition::LevelInfos& infos = definition->level_infos();
   EXPECT_EQ(6U, infos.size());
   EXPECT_EQ(1U, infos[0].size());
   manager_->SetTarget(texture2_, GL_TEXTURE_CUBE_MAP);
-  Restore(texture2_, definition.release());
+  Restore(texture2_, definition);
   EXPECT_EQ(face0,
             GetLevelInfo(texture2_.get(), GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0));
   EXPECT_EQ(face5,