Remove the socket_count parameter from NaCl Launch IPC messages.

chrome/renderer/pepper/ppb_nacl_private_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 "chrome/renderer/pepper/ppb_nacl_private_impl.h"
 
 #ifndef DISABLE_NACL
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 52 matching lines @@
   if (!host)
     return 0;
   return host->GetRoutingIDForWidget(instance);
 }
 
 // Launch NaCl's sel_ldr process.
 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();
 
   int routing_id = 0;
   // If the nexe uses ppapi APIs, we need a routing ID.
   // To get the routing ID, we must be on the main thread.
   // Some nexes do not use ppapi and launch from the background thread,
   // so those nexes can skip finding a routing_id.
   if (uses_ppapi) {
@@ skipping 11 matching lines @@
   // must also check on the trusted side of the proxy.
   if (enable_ppapi_dev)
     perm_bits |= ppapi::PERMISSION_DEV;
   instance_info.permissions =
       ppapi::PpapiPermissions::GetForCommandLine(perm_bits);
 
   if (!sender->Send(new ChromeViewHostMsg_LaunchNaCl(
           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))) {
     return PP_NACL_FAILED;
   }
 
   // Don't save instance_info if channel handle is invalid.
   bool invalid_handle = instance_info.channel_handle.name.empty();
 #if defined(OS_POSIX)
   if (!invalid_handle)
     invalid_handle = (instance_info.channel_handle.socket.fd == -1);
 #endif
   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;
 }
 
 PP_NaClResult StartPpapiProxy(PP_Instance instance) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableNaClSRPCProxy))
     return PP_NACL_USE_SRPC;
 
   InstanceInfoMap& map = g_instance_info.Get();
@@ skipping 143 matching lines @@
   &ReportNaClError
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() {
   return &nacl_interface;
 }
 
 #endif  // DISABLE_NACL