cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/trees/layer_tree_host_pixeltest_readback.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 "build/build_config.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 40 matching lines @@
     EXPECT_TRUE(proxy()->IsMainThread());
     EXPECT_TRUE(result->HasBitmap());
     result_bitmap_ = result->TakeBitmap().Pass();
     EndTest();
   }
 
   void ReadbackResultAsTexture(scoped_ptr<CopyOutputResult> result) {
     EXPECT_TRUE(proxy()->IsMainThread());
     EXPECT_TRUE(result->HasTexture());
 
-    scoped_ptr<TextureMailbox> texture_mailbox = result->TakeTexture().Pass();
-    EXPECT_TRUE(texture_mailbox->IsValid());
-    EXPECT_TRUE(texture_mailbox->IsTexture());
+    TextureMailbox texture_mailbox;
+    ScopedReleaseCallback release_callback;
+    result->TakeTexture(&texture_mailbox, &release_callback);
+    EXPECT_TRUE(texture_mailbox.IsValid());
+    EXPECT_TRUE(texture_mailbox.IsTexture());
 
     scoped_ptr<SkBitmap> bitmap =
-        CopyTextureMailboxToBitmap(result->size(), *texture_mailbox);
-    texture_mailbox->RunReleaseCallback(0, false);
+        CopyTextureMailboxToBitmap(result->size(), texture_mailbox);
+    release_callback.RunAndReset(0, false);
 
     ReadbackResultAsBitmap(CopyOutputResult::CreateBitmapResult(bitmap.Pass()));
   }
 
   gfx::Rect copy_subrect_;
 };
 
 TEST_F(LayerTreeHostReadbackPixelTest, ReadbackRootLayer_Software) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
@@ skipping 799 matching lines @@
                                  background,
                                  texture.get(),
                                  base::FilePath(FILE_PATH_LITERAL(
                                      "green_with_blue_corner.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID