PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_file_io_impl.cc

Index: webkit/plugins/ppapi/ppb_file_io_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_io_impl.cc b/webkit/plugins/ppapi/ppb_file_io_impl.cc
index 7fa69bcf7753615260a112dc71c55c1b2dfe55f8..4837a40d955ee56d6d5d1fa3b7e77d8903752439 100644
--- a/webkit/plugins/ppapi/ppb_file_io_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_io_impl.cc
@@ -27,6 +27,7 @@
 #include "webkit/plugins/ppapi/quota_file_io.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
+using ppapi::ApiCallbackType;
 using ppapi::PPTimeToTime;
 using ppapi::TimeToPPTime;
 using ppapi::thunk::PPB_FileRef_API;
@@ -47,7 +48,7 @@ PPB_FileIO_Impl::~PPB_FileIO_Impl() {
 int32_t PPB_FileIO_Impl::OpenValidated(PP_Resource file_ref_resource,
                                        PPB_FileRef_API* file_ref_api,
                                        int32_t open_flags,
-                                       PP_CompletionCallback callback) {
+                                       ApiCallbackType callback) {
   PPB_FileRef_Impl* file_ref = static_cast<PPB_FileRef_Impl*>(file_ref_api);
 
   int flags = 0;
@@ -80,7 +81,7 @@ int32_t PPB_FileIO_Impl::OpenValidated(PP_Resource file_ref_resource,
 }
 
 int32_t PPB_FileIO_Impl::QueryValidated(PP_FileInfo* info,
-                                        PP_CompletionCallback callback) {
+                                        ApiCallbackType callback) {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
@@ -97,7 +98,7 @@ int32_t PPB_FileIO_Impl::QueryValidated(PP_FileInfo* info,
 
 int32_t PPB_FileIO_Impl::TouchValidated(PP_Time last_access_time,
                                         PP_Time last_modified_time,
-                                        PP_CompletionCallback callback) {
+                                        ApiCallbackType callback) {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
@@ -117,7 +118,7 @@ int32_t PPB_FileIO_Impl::TouchValidated(PP_Time last_access_time,
 int32_t PPB_FileIO_Impl::ReadValidated(int64_t offset,
                                        char* buffer,
                                        int32_t bytes_to_read,
-                                       PP_CompletionCallback callback) {
+                                       ApiCallbackType callback) {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
@@ -136,7 +137,7 @@ int32_t PPB_FileIO_Impl::ReadValidated(int64_t offset,
 int32_t PPB_FileIO_Impl::WriteValidated(int64_t offset,
                                         const char* buffer,
                                         int32_t bytes_to_write,
-                                        PP_CompletionCallback callback) {
+                                        ApiCallbackType callback) {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
@@ -161,7 +162,7 @@ int32_t PPB_FileIO_Impl::WriteValidated(int64_t offset,
 }
 
 int32_t PPB_FileIO_Impl::SetLengthValidated(int64_t length,
-                                            PP_CompletionCallback callback) {
+                                            ApiCallbackType callback) {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
@@ -184,7 +185,7 @@ int32_t PPB_FileIO_Impl::SetLengthValidated(int64_t length,
   return PP_OK_COMPLETIONPENDING;
 }
 
-int32_t PPB_FileIO_Impl::FlushValidated(PP_CompletionCallback callback) {
+int32_t PPB_FileIO_Impl::FlushValidated(ApiCallbackType callback) {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
@@ -222,8 +223,8 @@ int32_t PPB_FileIO_Impl::GetOSFileDescriptor() {
 
 int32_t PPB_FileIO_Impl::WillWrite(int64_t offset,
                                    int32_t bytes_to_write,
-                                   PP_CompletionCallback callback) {
-  int32_t rv = CommonCallValidation(true, OPERATION_EXCLUSIVE, callback);
+                                   ApiCallbackType callback) {
+  int32_t rv = CommonCallValidation(true, OPERATION_EXCLUSIVE);
   if (rv != PP_OK)
     return rv;
 
@@ -241,8 +242,8 @@ int32_t PPB_FileIO_Impl::WillWrite(int64_t offset,
 }
 
 int32_t PPB_FileIO_Impl::WillSetLength(int64_t length,
-                                       PP_CompletionCallback callback) {
-  int32_t rv = CommonCallValidation(true, OPERATION_EXCLUSIVE, callback);
+                                       ApiCallbackType callback) {
+  int32_t rv = CommonCallValidation(true, OPERATION_EXCLUSIVE);
   if (rv != PP_OK)
     return rv;