PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_file_chooser_impl.h

Index: webkit/plugins/ppapi/ppb_file_chooser_impl.h
diff --git a/webkit/plugins/ppapi/ppb_file_chooser_impl.h b/webkit/plugins/ppapi/ppb_file_chooser_impl.h
index d5afc2d74f2f81487be726721d11fa113e2798e0..b7b7047b2e40deceb5db21aa9ba0fdf946f93739 100644
--- a/webkit/plugins/ppapi/ppb_file_chooser_impl.h
+++ b/webkit/plugins/ppapi/ppb_file_chooser_impl.h
@@ -16,8 +16,6 @@
 #include "ppapi/thunk/ppb_file_chooser_api.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
-struct PP_CompletionCallback;
-
 namespace ppapi {
 class TrackedCallback;
 }
@@ -55,28 +53,27 @@ class PPB_FileChooser_Impl : public ::ppapi::Resource,
   // Check that |callback| is valid (only non-blocking operation is supported)
   // and that no callback is already pending. Returns |PP_OK| if okay, else
   // |PP_ERROR_...| to be returned to the plugin.
-  int32_t ValidateCallback(const PP_CompletionCallback& callback);
+  int32_t ValidateCallback(::ppapi::ApiCallbackType callback);
 
   // Sets up |callback| as the pending callback. This should only be called once
   // it is certain that |PP_OK_COMPLETIONPENDING| will be returned.
-  void RegisterCallback(const PP_CompletionCallback& callback);
+  void RegisterCallback(::ppapi::ApiCallbackType callback);
 
   void RunCallback(int32_t result);
 
   // PPB_FileChooser_API implementation.
   virtual int32_t Show(const PP_ArrayOutput& output,
-                       const PP_CompletionCallback& callback) OVERRIDE;
-  virtual int32_t ShowWithoutUserGesture(
-      PP_Bool save_as,
-      PP_Var suggested_file_name,
-      const PP_ArrayOutput& output,
-      const PP_CompletionCallback& callback);
-  virtual int32_t Show0_5(const PP_CompletionCallback& callback) OVERRIDE;
+                       ::ppapi::ApiCallbackType callback) OVERRIDE;
+  virtual int32_t ShowWithoutUserGesture(PP_Bool save_as,
+                                         PP_Var suggested_file_name,
+                                         const PP_ArrayOutput& output,
+                                         ::ppapi::ApiCallbackType callback);
+  virtual int32_t Show0_5(::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual PP_Resource GetNextChosenFile() OVERRIDE;
   virtual int32_t ShowWithoutUserGesture0_5(
       PP_Bool save_as,
       PP_Var suggested_file_name,
-      const PP_CompletionCallback& callback) OVERRIDE;
+      ::ppapi::ApiCallbackType callback) OVERRIDE;
 
   // Splits a comma-separated MIME type list |accept_mime_types|, trims the
   // resultant split types, makes them lowercase, and returns them.