NaCl: Allow setting up multiple sockets for subprocess instead of just one

chrome/renderer/render_process_impl.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 32 matching lines @@
 
 namespace {
 
 bool LaunchNaClProcess(const char* url,
                        int imc_fd,
                        nacl::Handle* imc_handle,
                        nacl::Handle* nacl_process_handle,
                        int* nacl_process_id) {
   // TODO(gregoryd): nacl::FileDescriptor will be soon merged with
   // base::FileDescriptor
-  nacl::FileDescriptor imc_descriptor;
+  std::vector<nacl::FileDescriptor> sockets;
   base::ProcessHandle nacl_process;
   if (!RenderThread::current()->Send(
-    new ViewHostMsg_LaunchNaCl(ASCIIToWide(url),
-        imc_fd,
-        &imc_descriptor,
+    new ViewHostMsg_LaunchNaCl(
+        ASCIIToWide(url),
+        /* socket_count= */ 1,
+        &sockets,
         &nacl_process,
         reinterpret_cast<base::ProcessId*>(nacl_process_id)))) {
     return false;
   }
-  *imc_handle = nacl::ToNativeHandle(imc_descriptor);
+  CHECK(static_cast<int>(sockets.size()) == 1);
+  *imc_handle = nacl::ToNativeHandle(sockets[0]);
   *nacl_process_handle = nacl_process;
   return true;
 }
+
+bool LaunchNaClProcessMultiFD(const char* alleged_url,
+                              int socket_count,
+                              nacl::Handle* imc_handles,
+                              nacl::Handle* nacl_process_handle,
+                              int* nacl_process_id) {
+  // TODO(gregoryd): nacl::FileDescriptor will be soon merged with
+  // base::FileDescriptor
+  std::vector<nacl::FileDescriptor> sockets;
+  base::ProcessHandle nacl_process;
+  if (!RenderThread::current()->Send(
+    new ViewHostMsg_LaunchNaCl(
+        ASCIIToWide(alleged_url),
+        socket_count,
+        &sockets,
+        &nacl_process,
+        reinterpret_cast<base::ProcessId*>(nacl_process_id)))) {
+    return false;
+  }
+  CHECK(static_cast<int>(sockets.size()) == socket_count);
+  for (int i = 0; i < socket_count; i++) {
+    imc_handles[i] = nacl::ToNativeHandle(sockets[i]);
+  }
+  *nacl_process_handle = nacl_process;
+  return true;
+}
 
 }  // namespace
 
 //-----------------------------------------------------------------------------
 
 #if defined(OS_WIN)
 
 static iat_patch::IATPatchFunction g_iat_patch_createdca;
 HDC WINAPI CreateDCAPatch(LPCSTR driver_name,
                           LPCSTR device_name,
@@ skipping 74 matching lines @@
 
   if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
     StatisticsRecorder::set_dump_on_exit(true);
   }
 
 #ifndef DISABLE_NACL
   if (command_line.HasSwitch(switches::kInternalNaCl)) {
     std::map<std::string, uintptr_t> funcs;
     funcs["launch_nacl_process"] =
       reinterpret_cast<uintptr_t>(LaunchNaClProcess);
+    funcs["launch_nacl_process_multi_fd"] =
+      reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD);
     RegisterInternalNaClPlugin(funcs);
   }
 #endif
 
   if (!command_line.HasSwitch(switches::kDisableByteRangeSupport)) {
     webkit_glue::SetMediaCacheEnabled(true);
   }
 
 #if defined(OS_MACOSX)
   FilePath bundle_path = mac_util::MainAppBundlePath();
@@ skipping 186 matching lines @@
 }
 
 void RenderProcessImpl::ClearTransportDIBCache() {
   for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
     if (shared_mem_cache_[i]) {
       FreeTransportDIB(shared_mem_cache_[i]);
       shared_mem_cache_[i] = NULL;
     }
   }
 }