Tell nacl_helper to use non SFI mode in HandleForkRequest

components/nacl/browser/nacl_process_host.cc

Index: components/nacl/browser/nacl_process_host.cc
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 13169747becf4399c8193930c4d46448730d6c43..81b51e1b2149f399561b0ed78d27aed9670befc4 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -592,6 +592,8 @@ bool NaClProcessHost::LaunchSelLdr() {
   CopyNaClCommandLineArguments(cmd_line.get());
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
+                              uses_nonsfi_mode_ ?
+                              switches::kNaClNonSfiLoaderProcess :

[Mark Seaborn, 2014/03/28 15:38:42]

Have you checked all the places that use kNaClLoaderProcess to see if they also
need to check for the Non-SFI variant?

I found one:
AdjustLinuxOOMScore() in chrome/app/chrome_main_delegate.cc

[hamaji, 2014/03/30 03:31:35]

Sorry, I forgot to check this. It seems the one you mentioned is the only one we
need to modify. I couldn't understand nacl_broker_listener.cc well, but it seems
this is compiled only on windows.

                               switches::kNaClLoaderProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   if (NaClBrowser::GetDelegate()->DialogsAreSuppressed())
@@ -777,7 +779,6 @@ bool NaClProcessHost::StartNaClExecution() {
   params.enable_ipc_proxy = enable_ppapi_proxy();
   params.uses_irt = uses_irt_;
   params.enable_dyncode_syscalls = enable_dyncode_syscalls_;
-  params.uses_nonsfi_mode = uses_nonsfi_mode_;
 
   const ChildProcessData& data = process_->GetData();
   if (!ShareHandleToSelLdr(data.handle,
@@ -827,7 +828,7 @@ bool NaClProcessHost::StartNaClExecution() {
   }
 #endif
 
-  if (params.uses_nonsfi_mode) {
+  if (uses_nonsfi_mode_) {
 #if defined(OS_LINUX)
     const bool kNonSFIModeSupported = true;
 #else