Remove LoadModule SRPC for non-SFI mode.

components/nacl/common/nacl_types.h

 // 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.
 
 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
+#include "ipc/ipc_platform_file.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>   // for HANDLE
 #endif
 
 // TODO(gregoryd): add a Windows definition for base::FileDescriptor
@@ skipping 10 matching lines @@
   return desc.fd;
 }
 #endif
 
 
 // Parameters sent to the NaCl process when we start it.
 struct NaClStartParams {
   NaClStartParams();
   ~NaClStartParams();
 
+  IPC::PlatformFileForTransit nexe_file;
+
   std::vector<FileDescriptor> handles;
   FileDescriptor debug_stub_server_bound_socket;
 
   bool validation_cache_enabled;
   std::string validation_cache_key;
   // Chrome version string. Sending the version string over IPC avoids linkage
   // issues in cases where NaCl is not compiled into the main Chromium
   // executable or DLL.
   std::string version;
 
   bool enable_exception_handling;
   bool enable_debug_stub;
   bool enable_ipc_proxy;
   bool uses_irt;
   bool enable_dyncode_syscalls;
   // NOTE: Any new fields added here must also be added to the IPC

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

You missed this. :-)  See other comment...

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

Good catch. Fixed.

   // serialization in nacl_messages.h and (for POD fields) the constructor
   // in nacl_types.cc.
 };
 
 // Parameters sent to the browser process to have it launch a NaCl process.
 //
 // If you change this, you will also need to update the IPC serialization in
 // nacl_host_messages.h.
 struct NaClLaunchParams {
   NaClLaunchParams();
-  NaClLaunchParams(const std::string& u, int r, uint32 p,
+  NaClLaunchParams(const std::string& manifest_url,
+                   const IPC::PlatformFileForTransit& nexe_file,
+                   int render_view_id,
+                   uint32 permission_bits,
                    bool uses_irt,
                    bool uses_nonsfi_mode,
                    bool enable_dyncode_syscalls,
                    bool enable_exception_handling,
                    bool enable_crash_throttling);
   NaClLaunchParams(const NaClLaunchParams& l);
   ~NaClLaunchParams();
 
   std::string manifest_url;
+  IPC::PlatformFileForTransit nexe_file;
   int render_view_id;
   uint32 permission_bits;
   bool uses_irt;
   bool uses_nonsfi_mode;
   bool enable_dyncode_syscalls;
   bool enable_exception_handling;
   bool enable_crash_throttling;
 };
 
 struct NaClLaunchResult {
@@ skipping 20 matching lines @@
   // For plugin <-> renderer ManifestService communication.
   IPC::ChannelHandle manifest_service_ipc_channel_handle;
 
   base::ProcessId plugin_pid;
   int plugin_child_id;
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_COMMON_NACL_TYPES_H_