PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_file_io_impl.h

Index: webkit/plugins/ppapi/ppb_file_io_impl.h
diff --git a/webkit/plugins/ppapi/ppb_file_io_impl.h b/webkit/plugins/ppapi/ppb_file_io_impl.h
index 27353c67110cb55ec9f6a1f238d12bae2e3270d8..5c39905ce0a10b438a72b37d2c5a4b5a2aea1fd0 100644
--- a/webkit/plugins/ppapi/ppb_file_io_impl.h
+++ b/webkit/plugins/ppapi/ppb_file_io_impl.h
@@ -13,8 +13,6 @@
 #include "ppapi/shared_impl/ppb_file_io_shared.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
-struct PP_CompletionCallback;
-
 namespace webkit {
 namespace ppapi {
 
@@ -31,32 +29,33 @@ class PPB_FileIO_Impl : public ::ppapi::PPB_FileIO_Shared {
   virtual int32_t GetOSFileDescriptor() OVERRIDE;
   virtual int32_t WillWrite(int64_t offset,
                             int32_t bytes_to_write,
-                            PP_CompletionCallback callback) OVERRIDE;
+                            ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual int32_t WillSetLength(int64_t length,
-                                PP_CompletionCallback callback) OVERRIDE;
+                                ::ppapi::ApiCallbackType callback) OVERRIDE;
 
  private:
   // FileIOImpl overrides.
   virtual int32_t OpenValidated(PP_Resource file_ref_resource,
                                 ::ppapi::thunk::PPB_FileRef_API* file_ref_api,
                                 int32_t open_flags,
-                                PP_CompletionCallback callback) OVERRIDE;
+                                ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual int32_t QueryValidated(PP_FileInfo* info,
-                                 PP_CompletionCallback callback) OVERRIDE;
+                                 ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual int32_t TouchValidated(PP_Time last_access_time,
                                  PP_Time last_modified_time,
-                                 PP_CompletionCallback callback) OVERRIDE;
+                                 ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual int32_t ReadValidated(int64_t offset,
                                 char* buffer,
                                 int32_t bytes_to_read,
-                                PP_CompletionCallback callback) OVERRIDE;
+                                ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual int32_t WriteValidated(int64_t offset,
                                  const char* buffer,
                                  int32_t bytes_to_write,
-                                 PP_CompletionCallback callback) OVERRIDE;
-  virtual int32_t SetLengthValidated(int64_t length,
-                                     PP_CompletionCallback callback) OVERRIDE;
-  virtual int32_t FlushValidated(PP_CompletionCallback callback) OVERRIDE;
+                                 ::ppapi::ApiCallbackType callback) OVERRIDE;
+  virtual int32_t SetLengthValidated(
+      int64_t length,
+      ::ppapi::ApiCallbackType callback) OVERRIDE;
+  virtual int32_t FlushValidated(::ppapi::ApiCallbackType callback) OVERRIDE;
 
   // Returns the plugin delegate for this resource if it exists, or NULL if it
   // doesn't. Calling code should always check for NULL.