Tell nacl_helper to use non SFI mode in HandleForkRequest

components/nacl/loader/nacl_listener.cc

Index: components/nacl/loader/nacl_listener.cc
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index b5ee5f74fa0039b76c9bd1d75a347bd203df3bec..10335c8619b9ed0be3a3cdc3d4c644033996f170 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -202,6 +202,7 @@ NaClListener::NaClListener() : shutdown_event_(true, false),
                                io_thread_("NaCl_IOThread"),
 #if defined(OS_LINUX)
                                prereserved_sandbox_size_(0),
+                               uses_nonsfi_mode_(false),
 #endif
 #if defined(OS_POSIX)
                                number_of_cores_(-1),  // unknown/error
@@ -266,6 +267,8 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
   NaClChromeMainSetUrandomFd(urandom_fd);
 #endif
 
+  // TODO(hamaji): Add NaClChromeMainInitForNonSfi and use it when

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

Can you remove this comment?  See other review...

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

OK, it's easier :) I'll withdraw the patch for native_client repository.

+  // uses_nonsfi_mode_ is true.
   NaClChromeMainInit();
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
@@ -287,7 +290,7 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
     ppapi_renderer_handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
 
 #if defined(OS_LINUX)
-    if (params.uses_nonsfi_mode) {
+    if (uses_nonsfi_mode_) {
       // In non-SFI mode, we neither intercept nor rewrite the message using
       // NaClIPCAdapter, and the channels are connected between the plugin and
       // the hosts directly. So, the IPC::Channel instances will be created in
@@ -421,7 +424,7 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
 #endif
 
 #if defined(OS_LINUX)
-  if (params.uses_nonsfi_mode) {
+  if (uses_nonsfi_mode_) {
     nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
     return;
   }