Prototype: Use Chromium IPC for plugin LOAD_MODULE.

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 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 "components/nacl/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #if defined(OS_POSIX)
 #include <unistd.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "components/nacl/common/nacl_messages.h"
 #include "components/nacl/loader/nacl_ipc_adapter.h"
+#include "components/nacl/loader/nacl_trusted_listener.h"
 #include "components/nacl/loader/nacl_validation_db.h"
 #include "components/nacl/loader/nacl_validation_query.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 #include "native_client/src/trusted/validator/nacl_file_info.h"
 
 #if defined(OS_POSIX)
@@ skipping 138 matching lines @@
   }
 
  private:
   // The listener never dies, otherwise this might be a dangling reference.
   NaClListener* listener_;
 };
 
 
 NaClListener::NaClListener() : shutdown_event_(true, false),
                                io_thread_("NaCl_IOThread"),
+                               chrome_main_thread_("NaCl_ChromeMainThread"),
 #if defined(OS_LINUX)
                                prereserved_sandbox_size_(0),
 #endif
 #if defined(OS_POSIX)
                                number_of_cores_(-1),  // unknown/error
 #endif
                                main_loop_(NULL) {
   io_thread_.StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
+  chrome_main_thread_.StartWithOptions(
+      base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 #if defined(OS_WIN)
   DCHECK(g_listener == NULL);
   g_listener = this;
 #endif
 }
 
 NaClListener::~NaClListener() {
   NOTREACHED();
   shutdown_event_.Signal();
 #if defined(OS_WIN)
@@ skipping 28 matching lines @@
 bool NaClListener::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClListener, msg)
       IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnStart)
       IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void NaClListener::OnStart(const nacl::NaClStartParams& params) {
+  // DCHECK(trusted_plugin_channel_created_);
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
 
   if (params.enable_ipc_proxy) {
     // 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.
@@ skipping 80 matching lines @@
       params.debug_stub_server_bound_socket);
 #endif
 #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
 
+  // FIXME: Handle nonsfi.
 #if defined(OS_LINUX)
   if (params.enable_nonsfi_mode) {
     nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
     NOTREACHED();
     return;
   }
 #endif
-  NaClChromeMainStart(args);
-  NOTREACHED();
+
+  int irt_fd = args->irt_fd;
+  struct NaClApp* nap = NaClChromeMainCreateApp(args);
+  CreateTrustedPluginChannel(nap, irt_fd);
 }
+
+void NaClListener::CreateTrustedPluginChannel(struct NaClApp* nap, int irt_fd) {
+  fprintf(stderr, "NaClListener::OnCreateTrustedPluginChannel\n");
+  IPC::ChannelHandle handle =
+      IPC::Channel::GenerateVerifiedChannelID("nacl_trusted");
+  trusted_listener_ = new NaClTrustedListener(
+      handle, nap, irt_fd, io_thread_.message_loop_proxy().get(),
+      &shutdown_event_);
+#if defined(OS_POSIX)
+  handle.socket = base::FileDescriptor(
+      trusted_listener_->TakeClientFileDescriptor(), true);
+#endif
+  if (!Send(new NaClProcessHostMsg_TrustedPluginChannelCreated(handle)))
+    LOG(ERROR) << "Failed to send trusted plugin IPC channel handle "
+               << "to NaClProcessHost.";
+}