PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_url_loader_impl.h

Index: webkit/plugins/ppapi/ppb_url_loader_impl.h
diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.h b/webkit/plugins/ppapi/ppb_url_loader_impl.h
index 948f928aaaaa904fdc85fdcd236c2d17ac00ac11..532268b975dedfe81708b3c7161696798e51a7da 100644
--- a/webkit/plugins/ppapi/ppb_url_loader_impl.h
+++ b/webkit/plugins/ppapi/ppb_url_loader_impl.h
@@ -40,8 +40,8 @@ class PPB_URLLoader_Impl : public ::ppapi::Resource,
 
   // PPB_URLLoader_API implementation.
   virtual int32_t Open(PP_Resource request_id,
-                       PP_CompletionCallback callback) OVERRIDE;
-  virtual int32_t FollowRedirect(PP_CompletionCallback callback) OVERRIDE;
+                       ::ppapi::ApiCallbackType callback) OVERRIDE;
+  virtual int32_t FollowRedirect(::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual PP_Bool GetUploadProgress(int64_t* bytes_sent,
                                     int64_t* total_bytes_to_be_sent) OVERRIDE;
   virtual PP_Bool GetDownloadProgress(
@@ -50,9 +50,9 @@ class PPB_URLLoader_Impl : public ::ppapi::Resource,
   virtual PP_Resource GetResponseInfo() OVERRIDE;
   virtual int32_t ReadResponseBody(void* buffer,
                                    int32_t bytes_to_read,
-                                   PP_CompletionCallback callback) OVERRIDE;
+                                   ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual int32_t FinishStreamingToFile(
-      PP_CompletionCallback callback) OVERRIDE;
+      ::ppapi::ApiCallbackType callback) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void GrantUniversalAccess() OVERRIDE;
   virtual void SetStatusCallback(
@@ -89,11 +89,11 @@ class PPB_URLLoader_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(PP_CompletionCallback callback);
+  int32_t ValidateCallback(scoped_refptr< ::ppapi::TrackedCallback> 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(PP_CompletionCallback callback);
+  void RegisterCallback(scoped_refptr< ::ppapi::TrackedCallback> callback);
 
   void RunCallback(int32_t result);