Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore.

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 #include <peninputpanel_i.c>
 
 #include "base/bind.h"
@@ skipping 887 matching lines @@
         ::SendMessage(tooltip_hwnd_, TTM_POP, 0, 0);
     }
   }
 }
 
 BackingStore* RenderWidgetHostViewWin::AllocBackingStore(
     const gfx::Size& size) {
   return new BackingStoreWin(render_widget_host_, size);
 }
 
-bool RenderWidgetHostViewWin::CopyFromCompositingSurface(
-      const gfx::Size& size,
-      skia::PlatformCanvas* output) {
-  if (!accelerated_surface_.get())
-    return false;
-
-  if (size.IsEmpty())
-    return false;
-
-  if (!output->initialize(size.width(), size.height(), true))
-    return false;
-
-  return accelerated_surface_->CopyTo(
-      size, output->getTopDevice()->accessBitmap(true).getPixels());
-}
-
-void RenderWidgetHostViewWin::AsyncCopyFromCompositingSurface(
+void RenderWidgetHostViewWin::CopyFromCompositingSurface(
     const gfx::Size& size,
     skia::PlatformCanvas* output,
     base::Callback<void(bool)> callback) {
-  callback.Run(CopyFromCompositingSurface(size, output));
+  base::ScopedClosureRunner scoped_callback_runner(base::Bind(callback, false));
+  if (!accelerated_surface_.get())
+    return;
+
+  if (size.IsEmpty())
+    return;
+
+  if (!output->initialize(size.width(), size.height(), true))
+    return;
+
+  const bool result = accelerated_surface_->CopyTo(
+      size, output->getTopDevice()->accessBitmap(true).getPixels());
+  scoped_callback_runner.Release();
+  callback.Run(result);
 }
 
 void RenderWidgetHostViewWin::SetBackground(const SkBitmap& background) {
   content::RenderWidgetHostViewBase::SetBackground(background);
   render_widget_host_->SetBackground(background);
 }
 
 void RenderWidgetHostViewWin::ProcessTouchAck(
     WebKit::WebInputEvent::Type type, bool processed) {
   if (type == WebKit::WebInputEvent::TouchStart)
@@ skipping 1747 matching lines @@
 void RenderWidgetHostViewWin::ResetPointerDownContext() {
   // If the default focus on the page is on an edit field and we did not
   // receive a focus change in the context of a pointer down message, it means
   // that the pointer down message occurred on the edit field and we should
   // display the on screen keyboard
   if (!received_focus_change_after_pointer_down_ && virtual_keyboard_)
     DisplayOnScreenKeyboardIfNeeded();
   received_focus_change_after_pointer_down_ = false;
   pointer_down_context_ = false;
 }