Remove LoadModule SRPC for non-SFI mode.

components/nacl/common/nacl_types.cc

Index: components/nacl/common/nacl_types.cc
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index 0dc5a1cf312be215da7402ade1010a10f76395fa..0b096a65467e851fa2316380f06cf3e31c8f1495 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -8,7 +8,8 @@
 namespace nacl {
 
 NaClStartParams::NaClStartParams()
-    : validation_cache_enabled(false),
+    : nexe_file(IPC::InvalidPlatformFileForTransit()),
+      validation_cache_enabled(false),
       enable_exception_handling(false),
       enable_debug_stub(false),
       enable_ipc_proxy(false),
@@ -20,7 +21,8 @@ NaClStartParams::~NaClStartParams() {
 }
 
 NaClLaunchParams::NaClLaunchParams()
-    : render_view_id(0),
+    : nexe_file(IPC::InvalidPlatformFileForTransit()),
+      render_view_id(0),
       permission_bits(0),
       uses_irt(false),
       enable_dyncode_syscalls(false),
@@ -28,15 +30,18 @@ NaClLaunchParams::NaClLaunchParams()
       enable_crash_throttling(false) {
 }
 
-NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
-                                   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::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)
     : manifest_url(manifest_url),
+      nexe_file(nexe_file),
       render_view_id(render_view_id),
       permission_bits(permission_bits),
       uses_irt(uses_irt),
@@ -46,14 +51,16 @@ NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
       enable_crash_throttling(enable_crash_throttling) {
 }
 
-NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) {
-  manifest_url = l.manifest_url;
-  render_view_id = l.render_view_id;
-  permission_bits = l.permission_bits;
-  uses_irt = l.uses_irt;
-  enable_dyncode_syscalls = l.enable_dyncode_syscalls;
-  enable_exception_handling = l.enable_exception_handling;
-  enable_crash_throttling = l.enable_crash_throttling;
+NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l)
+    : manifest_url(l.manifest_url),
+      nexe_file(l.nexe_file),
+      render_view_id(l.render_view_id),
+      permission_bits(l.permission_bits),
+      uses_irt(l.uses_irt),
+      uses_nonsfi_mode(l.uses_nonsfi_mode),
+      enable_dyncode_syscalls(l.enable_dyncode_syscalls),
+      enable_exception_handling(l.enable_exception_handling),
+      enable_crash_throttling(l.enable_crash_throttling) {
 }
 
 NaClLaunchParams::~NaClLaunchParams() {