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

ppapi/proxy/ppb_broker_proxy.cc

 // Copyright (c) 2011 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 "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"
 #include "ppapi/thunk/ppb_broker_api.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace pp {
 namespace proxy {
 
@@ skipping 198 matching lines @@
 // The proxy owns the handle and transfers it to the Broker. At that point,
 // the plugin owns the handle and is responsible for closing it.
 // The caller guarantees that socket_handle is not valid if result is not PP_OK.
 void PPB_Broker_Proxy::OnMsgConnectComplete(
     const HostResource& resource,
     IPC::PlatformFileForTransit socket_handle,
     int32_t result) {
   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(
         IPC::PlatformFileForTransitToPlatformFile(socket_handle));
   } else {
     static_cast<Broker*>(enter.object())->ConnectComplete(socket_handle,
                                                           result);
   }
 }
 
@@ skipping 33 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 pp