Support non-SFI mode in NaCl manifest file.

components/nacl/renderer/ppb_nacl_private_impl.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/renderer/ppb_nacl_private_impl.h"
 
 #ifndef DISABLE_NACL
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 89 matching lines @@
   if (!host)
     return 0;
   return host->GetRoutingIDForWidget(instance);
 }
 
 // Launch NaCl's sel_ldr process.
 void LaunchSelLdr(PP_Instance instance,
                   const char* alleged_url,
                   PP_Bool uses_irt,
                   PP_Bool uses_ppapi,
+                  PP_Bool uses_nonsfi_mode,
                   PP_Bool enable_ppapi_dev,
                   PP_Bool enable_dyncode_syscalls,
                   PP_Bool enable_exception_handling,
                   PP_Bool enable_crash_throttling,
                   void* imc_handle,
                   struct PP_Var* error_message,
                   PP_CompletionCallback callback) {
   CHECK(ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->
             BelongsToCurrentThread());
 
@@ skipping 29 matching lines @@
   instance_info.permissions =
       ppapi::PpapiPermissions::GetForCommandLine(perm_bits);
   std::string error_message_string;
   nacl::NaClLaunchResult launch_result;
 
   if (!sender->Send(new NaClHostMsg_LaunchNaCl(
           nacl::NaClLaunchParams(instance_info.url.spec(),
                                  routing_id,
                                  perm_bits,
                                  PP_ToBool(uses_irt),
+                                 PP_ToBool(uses_nonsfi_mode),
                                  PP_ToBool(enable_dyncode_syscalls),
                                  PP_ToBool(enable_exception_handling),
                                  PP_ToBool(enable_crash_throttling)),
           &launch_result,
           &error_message_string))) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(callback.func, callback.user_data,
                    static_cast<int32_t>(PP_ERROR_FAILED)));
     return;
@@ skipping 126 matching lines @@
 int32_t GetNumberOfProcessors() {
   int32_t num_processors;
   IPC::Sender* sender = content::RenderThread::Get();
   DCHECK(sender);
   if(!sender->Send(new NaClHostMsg_NaClGetNumProcessors(&num_processors))) {
     return 1;
   }
   return num_processors;
 }
 
+PP_Bool IsNonSFIEnabled() {
+  bool enabled;
+  IPC::Sender* sender = content::RenderThread::Get();
+  DCHECK(sender);
+  if (!sender->Send(new NaClHostMsg_NaClIsNonSFIEnabled(&enabled))) {

[jvoung (off chromium), 2014/03/04 16:24:18]

Btw, is this because the flag is not passed from the browser -> renderer? Could
you just have it be passed along from browser -> renderer?

AppendExtraCommandLineSwitches in 
chrome/browser/chrome_content_browser_client.cc

[Mark Seaborn, 2014/03/04 16:34:00]

Command line arguments don't work well for the NaCl trusted plugin because it's
in a DLL.  It can't/shouldn't use base/ for parsing command line arguments.

[jvoung (off chromium), 2014/03/04 16:39:42]

I meant that this code could then use base/ for parsing command line arguments,
like Are3DInterfacesDisabled(), instead of sending a message (not the code in
src/trusted/plugin).

[Mark Seaborn, 2014/03/04 17:29:07]

Oh right, of course. :-)  Yes, I agree it would make more sense to inspect a
command line argument here, and not have the NaClHostMsg_NaClIsNonSFIEnabled
IPC.

[hidehiko, 2014/03/05 08:15:33]

Great to know. Done.

+    return PP_FALSE;
+  }
+  return PP_FromBool(enabled);
+}
+
 int32_t GetNexeFd(PP_Instance instance,
                   const char* pexe_url,
                   uint32_t abi_version,
                   uint32_t opt_level,
                   const char* last_modified,
                   const char* etag,
                   PP_Bool has_no_store_header,
                   const char* sandbox_isa,
                   const char* extra_flags,
                   PP_Bool* is_hit,
@@ skipping 227 matching lines @@
 
 const PPB_NaCl_Private nacl_interface = {
   &LaunchSelLdr,
   &StartPpapiProxy,
   &UrandomFD,
   &Are3DInterfacesDisabled,
   &BrokerDuplicateHandle,
   &GetReadonlyPnaclFD,
   &CreateTemporaryFile,
   &GetNumberOfProcessors,
+  &IsNonSFIEnabled,
   &GetNexeFd,
   &ReportTranslationFinished,
   &OpenNaClExecutable,
   &DispatchEvent,
   &SetReadOnlyProperty,
   &ReportLoadError,
   &InstanceDestroyed
 };
 
 }  // namespace
 
 namespace nacl {
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl
 
 #endif  // DISABLE_NACL