Change NaCl IPC PPAPI proxy startup to support a NaCl-Browser process

chrome/nacl/nacl_listener.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/nacl/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #include "base/command_line.h"
@@ skipping 180 matching lines @@
 }
 
 void NaClListener::OnMsgStart(const nacl::NaClStartParams& params) {
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
 
   if (params.enable_ipc_proxy) {
-    // Create the server side of the channel and notify the process host so it
-    // can reply to the renderer, which will connect as client.
-    IPC::ChannelHandle channel_handle =
+    // Create the initial PPAPI IPC channel between the NaCl IRT and the
+    // browser process. The IRT uses this channel to communicate with the
+    // browser and to create additional IPC channels to renderer processes.
+    IPC::ChannelHandle handle =
         IPC::Channel::GenerateVerifiedChannelID("nacl");
-
-    scoped_refptr<NaClIPCAdapter> ipc_adapter(new NaClIPCAdapter(
-        channel_handle, io_thread_.message_loop_proxy()));
-    args->initial_ipc_desc = ipc_adapter.get()->MakeNaClDesc();
-
+    scoped_refptr<NaClIPCAdapter> ipc_adapter(
+        new NaClIPCAdapter(handle, io_thread_.message_loop_proxy()));
+    // Pass a NaClDesc to the untrusted side. This will hold a ref to the
+    // NaClIPCAdapter.
+    args->initial_ipc_desc = ipc_adapter->MakeNaClDesc();
 #if defined(OS_POSIX)
-    channel_handle.socket = base::FileDescriptor(
-        ipc_adapter.get()->TakeClientFileDescriptor(), true);
+    handle.socket = base::FileDescriptor(
+        ipc_adapter->TakeClientFileDescriptor(), true);
 #endif
-
-    if (!Send(new NaClProcessHostMsg_PpapiChannelCreated(channel_handle)))
-      LOG(ERROR) << "Failed to send IPC channel handle to renderer.";
+    if (!Send(new NaClProcessHostMsg_PpapiChannelCreated(handle)))
+      LOG(ERROR) << "Failed to send IPC channel handle to NaClProcessHost.";
   }
 
   std::vector<nacl::FileDescriptor> handles = params.handles;
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   args->urandom_fd = dup(base::GetUrandomFD());
   if (args->urandom_fd < 0) {
     LOG(ERROR) << "Failed to dup() the urandom FD";
     return;
   }
@@ skipping 36 matching lines @@
 #if defined(OS_WIN)
   args->broker_duplicate_handle_func = BrokerDuplicateHandle;
   args->attach_debug_exception_handler_func = AttachDebugExceptionHandler;
 #endif
 #if defined(OS_LINUX)
   args->prereserved_sandbox_size = prereserved_sandbox_size_;
 #endif
   NaClChromeMainStart(args);
   NOTREACHED();
 }