Make ui::Snapshot asynchronous on Android, remove CompositeAndReadback.

cc/output/copy_output_request.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/output/copy_output_request.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/output/copy_output_result.h"
-#include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
 
 // static
 scoped_ptr<CopyOutputRequest> CopyOutputRequest::CreateRelayRequest(
     const CopyOutputRequest& original_request,
     const CopyOutputRequestCallback& result_callback) {
   scoped_ptr<CopyOutputRequest> relay = CreateRequest(result_callback);
@@ skipping 47 matching lines @@
 
 void CopyOutputRequest::SetTextureMailbox(
     const TextureMailbox& texture_mailbox) {
   DCHECK(!force_bitmap_result_);
   DCHECK(texture_mailbox.IsTexture());
   has_texture_mailbox_ = true;
   texture_mailbox_ = texture_mailbox;
 }
 
 }  // namespace cc