Remove LoadModule SRPC for non-SFI mode.

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)
@@ skipping 15 matching lines @@
 #include "ipc/ipc_sync_message_filter.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
 #include "native_client/src/public/nacl_file_info.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_LINUX)
+#include <fcntl.h>
+
 #include "components/nacl/loader/nonsfi/irt_random.h"
 #include "components/nacl/loader/nonsfi/nonsfi_main.h"
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #include "ppapi/nacl_irt/plugin_startup.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 
@@ skipping 395 matching lines @@
 
     // Send back to the client side IPC channel FD to the host.
     browser_handle.socket =
         base::FileDescriptor(browser_client_ppapi_fd, true);
     ppapi_renderer_handle.socket =
         base::FileDescriptor(renderer_client_ppapi_fd, true);
     manifest_service_handle.socket =
         base::FileDescriptor(manifest_service_client_fd, true);
   }
 
+  CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit());
+  NaClFileInfo nexe_file_info;
+  nexe_file_info.desc =
+      IPC::PlatformFileForTransitToPlatformFile(params.nexe_file);
+  nexe_file_info.file_token.lo = params.nexe_token_lo;
+  nexe_file_info.file_token.hi = params.nexe_token_hi;
+
+  nacl::nonsfi::MainStart(NaClDescIoFromFileInfo(nexe_file_info, O_RDONLY));

[Mark Seaborn, 2014/06/17 00:50:31]

Why move this to occur earlier?  It might reduce the chances of odd startup race
conditions if we keep this at the end of the function.

[hidehiko, 2014/06/18 08:43:32]

Moved below.

+
   // TODO(teravest): Do we plan on using this renderer handle for nexe loading
   // for non-SFI? Right now, passing an empty channel handle instead causes
   // hangs, so we'll keep it.
   IPC::ChannelHandle trusted_renderer_handle = CreateTrustedListener(
       io_thread_.message_loop_proxy(), &shutdown_event_);
   if (!Send(new NaClProcessHostMsg_PpapiChannelsCreated(
           browser_handle, ppapi_renderer_handle,
           trusted_renderer_handle, manifest_service_handle)))
     LOG(ERROR) << "Failed to send IPC channel handle to NaClProcessHost.";
 
   // Ensure that the validation cache key (used as an extra input to the
   // validation cache's hashing) isn't exposed accidentally.
   CHECK(!params.validation_cache_enabled);
   CHECK(params.validation_cache_key.size() == 0);
   CHECK(params.version.size() == 0);
   // Ensure that a debug stub FD isn't passed through accidentally.
   CHECK(!params.enable_debug_stub);
   CHECK(params.debug_stub_server_bound_socket.fd == -1);
 
   CHECK(!params.uses_irt);
+  // Currently imc bootstrap handle is still sent to the plugin.
+  // Get rid of this.

[Mark Seaborn, 2014/06/17 00:50:31]

Nit: This comment should have a "TODO" in front of it.

[hidehiko, 2014/06/18 08:43:32]

Done.

   CHECK(params.handles.size() == 1);
-  int imc_bootstrap_handle = nacl::ToNativeHandle(params.handles[0]);
-  nacl::nonsfi::MainStart(imc_bootstrap_handle);
 #endif  // defined(OS_LINUX)
 }
 
 IPC::ChannelHandle NaClListener::CreateTrustedListener(
     base::MessageLoopProxy* message_loop_proxy,
     base::WaitableEvent* shutdown_event) {
   // The argument passed to GenerateVerifiedChannelID() here MUST be "nacl".
   // Using an alternate channel name prevents the pipe from being created on
   // Windows when the sandbox is enabled.
   IPC::ChannelHandle trusted_renderer_handle =
       IPC::Channel::GenerateVerifiedChannelID("nacl");
   trusted_listener_ = new NaClTrustedListener(
       trusted_renderer_handle, io_thread_.message_loop_proxy().get());
 #if defined(OS_POSIX)
   trusted_renderer_handle.socket = base::FileDescriptor(
       trusted_listener_->TakeClientFileDescriptor(), true);
 #endif
   return trusted_renderer_handle;
 }