Support non-SFI mode in NaCl manifest file.

components/nacl/loader/nacl_listener.cc

 // 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.
 
 #include "components/nacl/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #if defined(OS_POSIX)
@@ skipping 269 matching lines @@
   }
 
   IPC::ChannelHandle browser_handle;
   IPC::ChannelHandle ppapi_renderer_handle;
 
   if (params.enable_ipc_proxy) {
     browser_handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
     ppapi_renderer_handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
 
 #if defined(OS_LINUX)
-    if (params.enable_nonsfi_mode) {
+    if (params.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
       // the plugin side, because the IPC::Listener needs to live on the
       // plugin's main thread. However, on initialization (i.e. before loading
       // the plugin binary), the FD needs to be passed to the hosts. So, here
       // we create raw FD pairs, and pass the client side FDs to the hosts,
       // and the server side FDs to the plugin.
       int browser_server_ppapi_fd;
       int browser_client_ppapi_fd;
@@ skipping 108 matching lines @@
 #endif
 #if defined(OS_WIN)
   args->broker_duplicate_handle_func = BrokerDuplicateHandle;
   args->attach_debug_exception_handler_func = AttachDebugExceptionHandler;
 #endif
 #if defined(OS_LINUX)
   args->prereserved_sandbox_size = prereserved_sandbox_size_;
 #endif
 
 #if defined(OS_LINUX)
-  if (params.enable_nonsfi_mode) {
+  if (params.uses_nonsfi_mode) {
     nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
     NOTREACHED();
     return;
   }
 #endif
   NaClChromeMainStartApp(nap, args);
   NOTREACHED();
 }