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 415 matching lines @@
   // 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);
+  // TODO(hidehiko): Currently imc bootstrap handle is still sent to the
+  // plugin. Get rid of this.
   CHECK(params.handles.size() == 1);
-  int imc_bootstrap_handle = nacl::ToNativeHandle(params.handles[0]);
-  nacl::nonsfi::MainStart(imc_bootstrap_handle);
+
+  CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit());
+  NaClFileInfo nexe_file_info = {};

[Mark Seaborn, 2014/06/18 19:53:12]

Since we don't need validation caching here, you shouldn't need to use
NaClFileInfo here.

So can you use the NaClDescIoDescFromDescAllocCtor() function rather than
NaClDescIoFromFileInfo(), please?  That would be cleaner than creating a dummy
NaClFileInfo.

It's OK to change include_rules to allow using src/trusted/desc/nacl_desc_io.h
for this.  (Finishing
https://code.google.com/p/nativeclient/issues/detail?id=2832 is still a work in
progress!)

[hidehiko, 2014/06/19 07:01:59]

Done. No need to change DEPS, as it already has src/trusted/desc.

+  nexe_file_info.desc =
+      IPC::PlatformFileForTransitToPlatformFile(params.nexe_file);
+  nacl::nonsfi::MainStart(NaClDescIoFromFileInfo(nexe_file_info, O_RDONLY));

[Mark Seaborn, 2014/06/18 19:53:12]

Pedantically, this should be NACL_ABI_O_RDONLY rather than O_RDONLY.

[hidehiko, 2014/06/19 07:01:59]

Done.

 #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;
 }