Support error handling for Surface readbacks

content/browser/browser_plugin/browser_plugin_guest.h

Index: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index cecca6de166bdef20bd3fb02d0282830af6e9146..e13ed8eed47e6a531e26bbe4f2972cdf33a9fcb9 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -27,6 +27,7 @@
 #include "base/values.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/input_event_ack_state.h"
+#include "content/common/readback_types.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
@@ -143,10 +144,9 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
 
   void UpdateVisibility();
 
-  void CopyFromCompositingSurface(
-      gfx::Rect src_subrect,
-      gfx::Size dst_size,
-      const base::Callback<void(bool, const SkBitmap&)>& callback);
+  void CopyFromCompositingSurface(gfx::Rect src_subrect,
+                                  gfx::Size dst_size,
+                                  CopyFromCompositingSurfaceCallback& callback);
 
   BrowserPluginGuestManager* GetBrowserPluginGuestManager() const;
 
@@ -342,8 +342,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
   // Each copy-request is identified by a unique number. The unique number is
   // used to keep track of the right callback.
   int copy_request_id_;
-  typedef base::Callback<void(bool, const SkBitmap&)> CopyRequestCallback;
-  typedef std::map<int, const CopyRequestCallback> CopyRequestMap;
+  typedef std::map<int, const CopyFromCompositingSurfaceCallback>
+      CopyRequestMap;
   CopyRequestMap copy_request_callbacks_;
 
   // Indicates that this BrowserPluginGuest has associated renderer-side state.