cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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/test/layer_tree_pixel_test.h"
 
 #include "base/path_service.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 107 matching lines @@
   layer->SetAnchorPoint(gfx::PointF());
   layer->SetBounds(rect.size());
   layer->SetPosition(rect.origin());
   layer->SetBackgroundColor(color);
   return layer;
 }
 
 void LayerTreePixelTest::EndTest() {
   // Drop TextureMailboxes on the main thread so that they can be cleaned up and
   // the pending callbacks will fire.
-  for (size_t i = 0; i < texture_layers_.size(); ++i)
-    texture_layers_[i]->SetTextureMailbox(TextureMailbox());
+  for (size_t i = 0; i < texture_layers_.size(); ++i) {
+    texture_layers_[i]->SetTextureMailbox(TextureMailbox(),
+                                          scoped_ptr<ScopedReleaseCallback>());
+  }
 
   TryEndTest();
 }
 
 void LayerTreePixelTest::TryEndTest() {
   if (!result_bitmap_)
     return;
   if (pending_texture_mailbox_callbacks_)
     return;
   LayerTreeTest::EndTest();
@@ skipping 27 matching lines @@
   return layer;
 }
 
 scoped_refptr<TextureLayer> LayerTreePixelTest::CreateTextureLayer(
     gfx::Rect rect, const SkBitmap& bitmap) {
   scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(NULL);
   layer->SetIsDrawable(true);
   layer->SetAnchorPoint(gfx::PointF());
   layer->SetBounds(rect.size());
   layer->SetPosition(rect.origin());
-  layer->SetTextureMailbox(CopyBitmapToTextureMailboxAsTexture(bitmap));
+
+  TextureMailbox texture_mailbox;
+  scoped_ptr<ScopedReleaseCallback> release_callback;
+  CopyBitmapToTextureMailboxAsTexture(
+      bitmap, &texture_mailbox, &release_callback);
+  layer->SetTextureMailbox(texture_mailbox, release_callback.Pass());
 
   texture_layers_.push_back(layer);
   pending_texture_mailbox_callbacks_++;
   return layer;
 }
 
 void LayerTreePixelTest::RunPixelTest(
     PixelTestType test_type,
     scoped_refptr<Layer> content_root,
     base::FilePath file_name) {
@@ skipping 106 matching lines @@
     uint32 texture,
     uint32 sync_point,
     bool lost_resource) {
   if (sync_point)
     context3d->waitSyncPoint(sync_point);
   context3d->deleteTexture(texture);
   pending_texture_mailbox_callbacks_--;
   TryEndTest();
 }
 
-TextureMailbox LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture(
-    const SkBitmap& bitmap) {
+void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture(
+    const SkBitmap& bitmap,
+    TextureMailbox* texture_mailbox,
+    scoped_ptr<ScopedReleaseCallback>* release_callback) {
   DCHECK_GT(bitmap.width(), 0);
   DCHECK_GT(bitmap.height(), 0);
 
   CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
 
   using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
   scoped_ptr<WebKit::WebGraphicsContext3D> context3d(
       WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
           WebKit::WebGraphicsContext3D::Attributes()));
 
@@ skipping 41 matching lines @@
                           GL_UNSIGNED_BYTE,
                           gl_pixels.get());
   }
 
   gpu::Mailbox mailbox;
   context3d->genMailboxCHROMIUM(mailbox.name);
   context3d->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
   context3d->bindTexture(GL_TEXTURE_2D, 0);
   uint32 sync_point = context3d->insertSyncPoint();
 
-  return TextureMailbox(
-      mailbox,
+  *texture_mailbox = TextureMailbox(mailbox, sync_point);
+  *release_callback = ScopedReleaseCallback::Create(
       base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
                  base::Unretained(this),
                  base::Passed(&context3d),
-                 texture_id),
-      sync_point);
+                 texture_id));
 }
 
 }  // namespace cc