cc: Add CopyAsBitmapRequest class to hold the readback callback.

cc/quads/render_pass_unittest.cc

Index: cc/quads/render_pass_unittest.cc
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index 9ab0123d2619c61643e1dd10f90e776d4602bcb5..9e8bf301b1457d9a06cb03fb0c5253fc75d8cbaa 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -5,6 +5,8 @@
 #include "cc/quads/render_pass.h"
 
 #include "cc/base/math_util.h"
+#include "cc/base/scoped_ptr_vector.h"
+#include "cc/output/copy_output_request.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/render_pass_test_common.h"
@@ -29,7 +31,7 @@ struct RenderPassSize {
   gfx::RectF damage_rect;
   bool has_transparent_background;
   bool has_occlusion_from_outside_target_surface;
-  std::vector<RenderPass::RequestCopyAsBitmapCallback> copy_callbacks;
+  ScopedPtrVector<CopyOutputRequest> copy_callbacks;
 };
 
 TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
@@ -48,7 +50,8 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
                transform_to_root,
                has_transparent_background,
                has_occlusion_from_outside_target_surface);
-  pass->copy_callbacks.push_back(RenderPass::RequestCopyAsBitmapCallback());
+  pass->copy_requests.push_back(CopyOutputRequest::CreateBitmapRequest(
+      CopyOutputRequest::CopyAsBitmapCallback()));
 
   // Stick a quad in the pass, this should not get copied.
   scoped_ptr<SharedQuadState> shared_state = SharedQuadState::Create();
@@ -74,8 +77,9 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
             copy->has_occlusion_from_outside_target_surface);
   EXPECT_EQ(0u, copy->quad_list.size());
 
-  // The copy callback should not be copied/duplicated.
-  EXPECT_EQ(0u, copy->copy_callbacks.size());
+  // The copy request should not be copied/duplicated.
+  EXPECT_EQ(1u, pass->copy_requests.size());
+  EXPECT_EQ(0u, copy->copy_requests.size());
 
   EXPECT_EQ(sizeof(RenderPassSize), sizeof(RenderPass));
 }