PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_broker_impl.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 "webkit/plugins/ppapi/ppb_broker_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/shared_impl/platform_file.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
+using ppapi::ApiCallbackType;
 using ppapi::PlatformFileToInt;
 using ppapi::thunk::PPB_Broker_API;
 using ppapi::TrackedCallback;
 
 namespace webkit {
 namespace ppapi {
 
 // PPB_Broker_Impl ------------------------------------------------------
 
 PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance)
@@ skipping 10 matching lines @@
   }
 
   // The plugin owns the handle.
   pipe_handle_ = PlatformFileToInt(base::kInvalidPlatformFileValue);
 }
 
 PPB_Broker_API* PPB_Broker_Impl::AsPPB_Broker_API() {
   return this;
 }
 
-int32_t PPB_Broker_Impl::Connect(PP_CompletionCallback connect_callback) {
-  if (!connect_callback.func) {
-    // Synchronous calls are not supported.
-    return PP_ERROR_BLOCKS_MAIN_THREAD;
-  }
-
+int32_t PPB_Broker_Impl::Connect(ApiCallbackType connect_callback) {
   // TODO(ddorwin): Return PP_ERROR_FAILED if plugin is in-process.
 
   if (broker_) {
     // May only be called once.
     return PP_ERROR_FAILED;
   }
 
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
 
   // The callback must be populated now in case we are connected to the broker
   // and BrokerConnected is called before ConnectToBroker returns.
   // Because it must be created now, it must be aborted and cleared if
   // ConnectToBroker fails.
-  connect_callback_ = new TrackedCallback(this, connect_callback);
+  connect_callback_ = connect_callback;
 
   broker_ = plugin_instance->delegate()->ConnectToBroker(this);
   if (!broker_) {
     TrackedCallback::ClearAndAbort(&connect_callback_);
     return PP_ERROR_FAILED;
   }
 
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ skipping 14 matching lines @@
   pipe_handle_ = handle;
 
   // Synchronous calls are not supported.
   DCHECK(TrackedCallback::IsPending(connect_callback_));
 
   TrackedCallback::ClearAndRun(&connect_callback_, result);
 }
 
 }  // namespace ppapi
 }  // namespace webkit