Support non-SFI mode in NaCl manifest file.

components/nacl/renderer/ppb_nacl_private_impl.cc

Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 237e6d9a02489276b1cff798c15867f722197055..0a55c62419e6019dd6166dbe15916488549cfd38 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -111,6 +111,7 @@ void LaunchSelLdr(PP_Instance instance,
                   PP_Bool enable_dyncode_syscalls,
                   PP_Bool enable_exception_handling,
                   PP_Bool enable_crash_throttling,
+                  PP_Bool enable_nonsfi,
                   void* imc_handle,
                   struct PP_Var* error_message,
                   PP_CompletionCallback callback) {
@@ -158,7 +159,8 @@ void LaunchSelLdr(PP_Instance instance,
                                  PP_ToBool(uses_irt),
                                  PP_ToBool(enable_dyncode_syscalls),
                                  PP_ToBool(enable_exception_handling),
-                                 PP_ToBool(enable_crash_throttling)),
+                                 PP_ToBool(enable_crash_throttling),
+                                 PP_ToBool(enable_nonsfi)),
           &launch_result,
           &error_message_string))) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
@@ -302,6 +304,16 @@ int32_t GetNumberOfProcessors() {
   return num_processors;
 }
 
+PP_Bool IsNonSFIEnabled() {
+  bool enabled;
+  IPC::Sender* sender = content::RenderThread::Get();
+  DCHECK(sender);
+  if (!sender->Send(new NaClHostMsg_NaClIsNonSFIEnabled(&enabled))) {
+    return PP_FALSE;
+  }
+  return PP_FromBool(enabled);
+}
+
 int32_t GetNexeFd(PP_Instance instance,
                   const char* pexe_url,
                   uint32_t abi_version,
@@ -549,6 +561,7 @@ const PPB_NaCl_Private nacl_interface = {
   &GetReadonlyPnaclFD,
   &CreateTemporaryFile,
   &GetNumberOfProcessors,
+  &IsNonSFIEnabled,
   &GetNexeFd,
   &ReportTranslationFinished,
   &OpenNaClExecutable,