PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_broker_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_broker_proxy.h"
 
 #include "base/bind.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/proxy/enter_proxy.h"
@@ skipping 15 matching lines @@
 
 class Broker : public PPB_Broker_API, public Resource {
  public:
   explicit Broker(const HostResource& resource);
   virtual ~Broker();
 
   // Resource overrides.
   virtual PPB_Broker_API* AsPPB_Broker_API() OVERRIDE;
 
   // PPB_Broker_API implementation.
-  virtual int32_t Connect(PP_CompletionCallback connect_callback) OVERRIDE;
+  virtual int32_t Connect(ApiCallbackType connect_callback) OVERRIDE;
   virtual int32_t GetHandle(int32_t* handle) OVERRIDE;
 
   // Called by the proxy when the host side has completed the request.
   void ConnectComplete(IPC::PlatformFileForTransit socket_handle,
                        int32_t result);
 
  private:
   bool called_connect_;
   scoped_refptr<TrackedCallback> current_connect_callback_;
 
@@ skipping 13 matching lines @@
 }
 
 Broker::~Broker() {
   socket_handle_ = base::kInvalidPlatformFileValue;
 }
 
 PPB_Broker_API* Broker::AsPPB_Broker_API() {
   return this;
 }
 
-int32_t Broker::Connect(PP_CompletionCallback connect_callback) {
-  if (!connect_callback.func) {
-    // Synchronous calls are not supported.
-    return PP_ERROR_BLOCKS_MAIN_THREAD;
-  }
-
+int32_t Broker::Connect(ApiCallbackType connect_callback) {
   if (TrackedCallback::IsPending(current_connect_callback_))
     return PP_ERROR_INPROGRESS;
   else if (called_connect_)
     return PP_ERROR_FAILED;
 
-  current_connect_callback_ = new TrackedCallback(this, connect_callback);
+  current_connect_callback_ = connect_callback;
   called_connect_ = true;
 
   bool success = PluginDispatcher::GetForResource(this)->Send(
       new PpapiHostMsg_PPBBroker_Connect(
           API_ID_PPB_BROKER, host_resource()));
   return success ?  PP_OK_COMPLETIONPENDING : PP_ERROR_FAILED;
 }
 
 int32_t Broker::GetHandle(int32_t* handle) {
   if (socket_handle_ == base::kInvalidPlatformFileValue)
@@ skipping 134 matching lines @@
       // The easiest way to clean it up is to just put it in an object
       // and then close it. This failure case is not performance critical.
       // The handle could still leak if Send succeeded but the IPC later failed.
       base::SyncSocket temp_socket(
           IPC::PlatformFileForTransitToPlatformFile(foreign_socket_handle));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi