cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/test/layer_tree_pixel_test.h

 // 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/resources/scoped_release_callback.h"
 #include "cc/test/layer_tree_test.h"
 
 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
 
 class SkBitmap;
 
 namespace cc {
 class CopyOutputRequest;
 class CopyOutputResult;
@@ skipping 48 matching lines @@
 
   void RunPixelTestWithReadbackTarget(PixelTestType type,
                                       scoped_refptr<Layer> content_root,
                                       Layer* target,
                                       base::FilePath file_name);
 
   scoped_ptr<SkBitmap> CopyTextureMailboxToBitmap(
       gfx::Size size,
       const TextureMailbox& texture_mailbox);
 
-  TextureMailbox CopyBitmapToTextureMailboxAsTexture(const SkBitmap& bitmap);
+  void CopyBitmapToTextureMailboxAsTexture(
+      const SkBitmap& bitmap,
+      TextureMailbox* texture_mailbox,
+      scoped_ptr<ScopedReleaseCallback>* release_callback);
 
   void ReleaseTextureMailbox(
       scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
       uint32 texture,
       uint32 sync_point,
       bool lost_resource);
 
   // Common CSS colors defined for tests to use.
   enum Colors {
     kCSSOrange = 0xffffa500,
     kCSSBrown = 0xffa52a2a,
     kCSSGreen = 0xff008000,
   };
 
   scoped_ptr<PixelComparator> pixel_comparator_;
   PixelTestType test_type_;
   scoped_refptr<Layer> content_root_;
   Layer* readback_target_;
   base::FilePath ref_file_;
   scoped_ptr<SkBitmap> result_bitmap_;
   std::vector<scoped_refptr<TextureLayer> > texture_layers_;
   int pending_texture_mailbox_callbacks_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_PIXEL_TEST_H_