Index: components/nacl/loader/nacl_listener.cc |
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc |
index cd175dda5f6e0aa540f0c25fed7ebd8aa4ee2906..d85c043c908f748812a39c4662fe4078b36780b0 100644 |
--- a/components/nacl/loader/nacl_listener.cc |
+++ b/components/nacl/loader/nacl_listener.cc |
@@ -32,6 +32,7 @@ |
#endif |
#if defined(OS_LINUX) |
+#include "components/nacl/loader/nonsfi/nonsfi_main.h" |
#include "content/public/common/child_process_sandbox_support_linux.h" |
#endif |
@@ -331,6 +332,15 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) { |
#if defined(OS_LINUX) |
args->prereserved_sandbox_size = prereserved_sandbox_size_; |
#endif |
+ |
Mark Seaborn
2013/12/17 21:18:55
Nit: remove one empty line here so that there's no
hidehiko
2013/12/18 08:38:03
Done.
|
+ |
+#if defined(OS_LINUX) |
+ if (params.enable_nonsfi_mode) { |
+ nacl::nonsfi::MainStart(args->imc_bootstrap_handle); |
+ NOTREACHED(); |
+ return; |
+ } |
+#endif |
NaClChromeMainStart(args); |
NOTREACHED(); |
} |