Index: chrome/renderer/pepper/ppb_nacl_private_impl.cc |
diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc |
index ab0801adfcdca24a1517e5e92237acf2a2f6cef4..647ac586c0fd49762d991111db2eccaebe9ac98c 100644 |
--- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc |
+++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc |
@@ -70,9 +70,8 @@ PP_NaClResult LaunchSelLdr(PP_Instance instance, |
const char* alleged_url, |
PP_Bool uses_ppapi, |
PP_Bool enable_ppapi_dev, |
- int socket_count, |
- void* imc_handles) { |
- std::vector<nacl::FileDescriptor> sockets; |
+ void* imc_handle) { |
+ nacl::FileDescriptor result_socket; |
IPC::Sender* sender = content::RenderThread::Get(); |
if (sender == NULL) |
sender = g_background_thread_sender.Pointer()->get(); |
@@ -104,7 +103,7 @@ PP_NaClResult LaunchSelLdr(PP_Instance instance, |
instance_info.url, |
routing_id, |
perm_bits, |
- socket_count, &sockets, |
+ &result_socket, |
&instance_info.channel_handle, |
&instance_info.plugin_pid, |
&instance_info.plugin_child_id))) { |
@@ -120,11 +119,8 @@ PP_NaClResult LaunchSelLdr(PP_Instance instance, |
if (!invalid_handle) |
g_instance_info.Get()[instance] = instance_info; |
- CHECK(static_cast<int>(sockets.size()) == socket_count); |
- for (int i = 0; i < socket_count; i++) { |
- static_cast<nacl::Handle*>(imc_handles)[i] = |
- nacl::ToNativeHandle(sockets[i]); |
- } |
+ *(static_cast<nacl::Handle*>(imc_handle)) = |
+ nacl::ToNativeHandle(result_socket); |
return PP_NACL_OK; |
} |