From c8c0738ff3d0debacd716400e9a1f516133b36d6 Mon Sep 17 00:00:00 2001 From: "ddorwin@chromium.org" Date: Thu, 2 Jun 2011 17:01:04 +0000 Subject: Fix a bug in the Broker proxy thunk that breaks the Connect callback when running out-of-process. BUG=none TEST=Use the Broker in an out-of-process plugin. The Connect callback should be received correctly. Review URL: http://codereview.chromium.org/7066040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87620 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/ppb_broker_proxy.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ppapi/proxy/ppb_broker_proxy.cc') diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc index 97fe0d0..fd789de 100644 --- a/ppapi/proxy/ppb_broker_proxy.cc +++ b/ppapi/proxy/ppb_broker_proxy.cc @@ -6,6 +6,7 @@ #include "ppapi/c/pp_errors.h" #include "ppapi/c/trusted/ppb_broker_trusted.h" +#include "ppapi/proxy/enter_proxy.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_messages.h" @@ -224,8 +225,7 @@ void PPB_Broker_Proxy::OnMsgConnectComplete( DCHECK(result == PP_OK || socket_handle == IPC::InvalidPlatformFileForTransit()); - ppapi::thunk::EnterResourceNoLock enter( - resource.host_resource(), true); + EnterPluginFromHostResource enter(resource); if (enter.failed()) { // As in Broker::ConnectComplete, we need to close the resource on error. base::SyncSocket temp_socket( -- cgit v1.1