cc: Add CopyAsBitmapRequest class to hold the readback callback.

cc/test/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/pixel_test.h"
 
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/copy_output_request.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/software_renderer.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
 #include "webkit/gpu/context_provider_in_process.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
@@ skipping 47 matching lines @@
                                         comparator);
 }
 
 bool PixelTest::RunPixelTestWithReadbackTarget(
     RenderPassList* pass_list,
     RenderPass* target,
     const base::FilePath& ref_file,
     const PixelComparator& comparator) {
   base::RunLoop run_loop;
 
-  target->copy_callbacks.push_back(
+  target->copy_requests.push_back(CopyOutputRequest::CreateBitmapRequest(
       base::Bind(&PixelTest::ReadbackResult,
                  base::Unretained(this),
-                 run_loop.QuitClosure()));
+                 run_loop.QuitClosure())));
 
   renderer_->DecideRenderPassAllocationsForFrame(*pass_list);
   renderer_->DrawFrame(pass_list);
 
   // Wait for the readback to complete.
   resource_provider_->Finish();
   run_loop.Run();
 
   return PixelsMatchReference(ref_file, comparator);
 }
@@ skipping 51 matching lines @@
   scoped_ptr<SoftwareOutputDevice> device(new SoftwareOutputDevice());
   output_surface_.reset(new OutputSurface(device.Pass()));
   resource_provider_ = ResourceProvider::Create(output_surface_.get(), 0);
   renderer_ = SoftwareRenderer::Create(
       fake_client_.get(),
       output_surface_.get(),
       resource_provider_.get()).PassAs<DirectRenderer>();
 }
 
 }  // namespace cc