Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore.

content/public/browser/render_widget_host.h

Index: content/public/browser/render_widget_host.h
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h
index 1bfd50cd51bf77b7ce55eddc9759d5af30ee0e5e..aa1e3d234a66f0763425adcff99f3aae974bab22 100644
--- a/content/public/browser/render_widget_host.h
+++ b/content/public/browser/render_widget_host.h
@@ -163,33 +163,25 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Sender {
 
   virtual void Blur() = 0;
 
-  // DEPRECATED: Synchronous version of AsyncCopyFromBackingSurface.
-  // This will be removed once all the caller have been changed to use the
-  // asynchronous version.
-  virtual bool CopyFromBackingStore(const gfx::Rect& src_rect,
-                                    const gfx::Size& accelerated_dest_size,
-                                    skia::PlatformCanvas* output) = 0;
-
   // Copies the given subset of the backing store into the given (uninitialized)
   // PlatformCanvas. If |src_rect| is empty, the whole contents is copied.
-  // |callback| is invoked with true on success, false otherwise. |output| can
-  // be initialized even on failure.
-  // When accelerated compositing is active, the contents is copied
-  // asynchronously from the compositing surface, but when the backing store is
-  // available, the contents is copied synchronously because it's fast enough.
+  // NOTE: |src_rect| is not supported yet when accelerated compositing is
+  // active (http://crbug.com/118571) and the whole content is always copied
+  // regardless of |src_rect|.
   // If non empty |accelerated_dest_size| is given and accelerated compositing
   // is active, the content is shrinked so that it fits in
   // |accelerated_dest_size|. If |accelerated_dest_size| is larger than the
   // contens size, the content is not resized. If |accelerated_dest_size| is
   // empty, the size copied from the source contents is used.
-  // NOTE: |src_rect| is not supported yet when accelerated compositing is
-  // active (http://crbug.com/118571) and the whole content is always copied
-  // regardless of |src_rect|.
-  virtual void AsyncCopyFromBackingStore(
-      const gfx::Rect& src_rect,
-      const gfx::Size& accelerated_dest_size,
-      skia::PlatformCanvas* output,
-      base::Callback<void(bool)> callback) = 0;
+  // |callback| is invoked with true on success, false otherwise. |output| can
+  // be initialized even on failure.
+  // NOTE: |callback| is called synchronously if the backing store is available.
+  // When accelerated compositing is active, it is called asynchronously on Aura
+  // and synchronously on the other platforms.
+  virtual void CopyFromBackingStore(const gfx::Rect& src_rect,
+                                    const gfx::Size& accelerated_dest_size,
+                                    skia::PlatformCanvas* output,
+                                    base::Callback<void(bool)> callback) = 0;
 #if defined(TOOLKIT_GTK)
   // Paint the backing store into the target's |dest_rect|.
   virtual bool CopyFromBackingStoreToGtkWindow(const gfx::Rect& dest_rect,