Fix a bug in the Broker proxy thunk that prevents using the Broker out-of-process.

ppapi/proxy/ppb_broker_proxy.cc

Index: ppapi/proxy/ppb_broker_proxy.cc
diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc
index 97fe0d0acf6c65b72ef4b2413e12489b542c1dbf..fd789de5e264f737fd7ef86873ee71c5dde3b2d8 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<ppapi::thunk::PPB_Broker_API> enter(
-      resource.host_resource(), true);
+  EnterPluginFromHostResource<ppapi::thunk::PPB_Broker_API> enter(resource);
   if (enter.failed()) {
     // As in Broker::ConnectComplete, we need to close the resource on error.
     base::SyncSocket temp_socket(