cc: Add CopyAsBitmapRequest class to hold the readback callback.

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/output/copy_output_request.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_comparator.h"
 #include "cc/test/pixel_test_utils.h"
 #include "cc/trees/layer_tree_impl.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"
 
 namespace cc {
 
@@ skipping 40 matching lines @@
 
   EXPECT_TRUE(MatchesPNGFile(*bitmap,
                              test_data_dir.Append(ref_file_),
                              *pixel_comparator_));
   EndTest();
 }
 
 void LayerTreePixelTest::BeginTest() {
   Layer* target = readback_target_ ? readback_target_
                                    : layer_tree_host()->root_layer();
-  target->RequestCopyAsBitmap(
+  target->RequestCopyOfOutput(CopyOutputRequest::CreateBitmapRequest(
       base::Bind(&LayerTreePixelTest::ReadbackResult,
-                 base::Unretained(this)));
+                 base::Unretained(this))));
   PostSetNeedsCommitToMainThread();
 }
 
 void LayerTreePixelTest::AfterTest() {}
 
 scoped_refptr<SolidColorLayer> LayerTreePixelTest::CreateSolidColorLayer(
     gfx::Rect rect, SkColor color) {
   scoped_refptr<SolidColorLayer> layer = SolidColorLayer::Create();
   layer->SetIsDrawable(true);
   layer->SetAnchorPoint(gfx::PointF());
@@ skipping 52 matching lines @@
 
 void LayerTreePixelTest::SetupTree() {
   scoped_refptr<Layer> root = Layer::Create();
   root->SetBounds(content_root_->bounds());
   root->AddChild(content_root_);
   layer_tree_host()->SetRootLayer(root);
   LayerTreeTest::SetupTree();
 }
 
 }  // namespace cc