Add a whitelist check for nacl-nonsfi mode

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"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 483 matching lines @@
   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 IsNonSFIModeEnabled() {
-#if defined(OS_LINUX)
+  // Note that this only indicates whether non-sfi mode *can* run for a given
+  // platform and if nonsfi manifest entries are preferred.  There can be other
+  // restrictions which prevent a particular module from launching.  See
+  // NaClProcessHost::Launch which makes the final determination.
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)

[Mark Seaborn, 2014/05/08 01:06:02]

Same comment as in other file

[elijahtaylor1, 2014/05/08 20:00:24]

Done.

+  return PP_TRUE;
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS)

[Mark Seaborn, 2014/05/08 01:06:02]

Same here too

[elijahtaylor1, 2014/05/08 20:00:24]

Done.

   return PP_FromBool(CommandLine::ForCurrentProcess()->HasSwitch(
                          switches::kEnableNaClNonSfiMode));
 #else
   return PP_FALSE;
 #endif
 }
 
 int32_t GetNexeFd(PP_Instance instance,
                   const char* pexe_url,
                   uint32_t abi_version,
@@ skipping 518 matching lines @@
   &DownloadManifestToBuffer
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl