Revert 285028 "Pepper: Remove LOAD_MODULE SRPC call in SFI mode."

trunk/src/components/nacl/common/nacl_types.cc

Index: trunk/src/components/nacl/common/nacl_types.cc
===================================================================
--- trunk/src/components/nacl/common/nacl_types.cc	(revision 285116)
+++ trunk/src/components/nacl/common/nacl_types.cc	(working copy)
@@ -9,8 +9,6 @@
 
 NaClStartParams::NaClStartParams()
     : nexe_file(IPC::InvalidPlatformFileForTransit()),
-      nexe_token_lo(0),
-      nexe_token_hi(0),
       validation_cache_enabled(false),
       enable_exception_handling(false),
       enable_debug_stub(false),
@@ -24,8 +22,6 @@
 
 NaClLaunchParams::NaClLaunchParams()
     : nexe_file(IPC::InvalidPlatformFileForTransit()),
-      nexe_token_lo(0),
-      nexe_token_hi(0),
       render_view_id(0),
       permission_bits(0),
       uses_irt(false),
@@ -37,8 +33,6 @@
 NaClLaunchParams::NaClLaunchParams(
     const std::string& manifest_url,
     const IPC::PlatformFileForTransit& nexe_file,
-    uint64_t nexe_token_lo,
-    uint64_t nexe_token_hi,
     int render_view_id,
     uint32 permission_bits,
     bool uses_irt,
@@ -48,8 +42,6 @@
     bool enable_crash_throttling)
     : manifest_url(manifest_url),
       nexe_file(nexe_file),
-      nexe_token_lo(nexe_token_lo),
-      nexe_token_hi(nexe_token_hi),
       render_view_id(render_view_id),
       permission_bits(permission_bits),
       uses_irt(uses_irt),
@@ -59,6 +51,18 @@
       enable_crash_throttling(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() {
 }