cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/output/gl_renderer.cc

 // Copyright 2010 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 "cc/output/gl_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 2214 matching lines @@
       context_->deleteTexture(texture_id);
       request->SendEmptyResult();
       return;
     }
 
     GLC(context_, context_->bindTexture(GL_TEXTURE_2D, texture_id));
     GLC(context_, context_->produceTextureCHROMIUM(
         GL_TEXTURE_2D, mailbox.name));
     GLC(context_, context_->bindTexture(GL_TEXTURE_2D, 0));
     sync_point = context_->insertSyncPoint();
-    scoped_ptr<TextureMailbox> texture_mailbox = make_scoped_ptr(
-        new TextureMailbox(mailbox,
-                           texture_mailbox_deleter_->GetReleaseCallback(
-                               output_surface_->context_provider(), texture_id),
-                           GL_TEXTURE_2D,
-                           sync_point));
-    request->SendTextureResult(window_rect.size(), texture_mailbox.Pass());
+    TextureMailbox texture_mailbox(mailbox, GL_TEXTURE_2D, sync_point);
+    ScopedReleaseCallback release_callback =
+        texture_mailbox_deleter_->GetReleaseCallback(
+            output_surface_->context_provider(), texture_id);
+    request->SendTextureResult(window_rect.size(),
+                               texture_mailbox,
+                               release_callback.Pass());
     return;
   }
 
   DCHECK(request->force_bitmap_result());
 
   scoped_ptr<SkBitmap> bitmap(new SkBitmap);
   bitmap->setConfig(SkBitmap::kARGB_8888_Config,
                     window_rect.width(),
                     window_rect.height());
   bitmap->allocPixels();
@@ skipping 890 matching lines @@
     return;
   offscreen_context_labelled_ = true;
   std::string unique_context_name = base::StringPrintf(
       "%s-Offscreen-%p", settings_->compositor_name.c_str(), context_);
   offscreen_context_provider->Context3d()
       ->pushGroupMarkerEXT(unique_context_name.c_str());
 }
 
 
 }  // namespace cc