Split NaCl SFI and non-SFI helpers into separate processes

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 <numeric>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/cpu.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "components/nacl/common/nacl_host_messages.h"
 #include "components/nacl/common/nacl_messages.h"
+#include "components/nacl/common/nacl_nonsfi_util.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/renderer/histogram.h"
 #include "components/nacl/renderer/json_manifest.h"
 #include "components/nacl/renderer/manifest_downloader.h"
 #include "components/nacl/renderer/manifest_service_channel.h"
 #include "components/nacl/renderer/nexe_load_manager.h"
 #include "components/nacl/renderer/pnacl_translation_resource_host.h"
 #include "components/nacl/renderer/progress_event.h"
 #include "components/nacl/renderer/sandbox_arch.h"
@@ skipping 485 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 IsNonSFIModeEnabled() {
-// 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_ARMEL)
-  return PP_TRUE;
-#elif defined(OS_LINUX)
-  return PP_FromBool(CommandLine::ForCurrentProcess()->HasSwitch(
-                         switches::kEnableNaClNonSfiMode));
-#else
-  return PP_FALSE;
-#endif
+PP_Bool PPIsNonSFIModeEnabled() {
+  return PP_FromBool(IsNonSFIModeEnabled());
 }
 
 int32_t GetNexeFd(PP_Instance instance,
                   const char* pexe_url,
                   uint32_t abi_version,
                   uint32_t opt_level,
                   const char* http_headers_param,
                   const char* extra_flags,
                   PP_Bool* is_hit,
                   PP_FileHandle* handle,
@@ skipping 449 matching lines @@
                            const char* manifest_url,
                            const char* isa_type,
                            const char* manifest_data) {
   int32_t manifest_id = g_next_manifest_id.Get();
   g_next_manifest_id.Get()++;
 
   scoped_ptr<nacl::JsonManifest> j(
       new nacl::JsonManifest(
           manifest_url,
           isa_type,
-          PP_ToBool(IsNonSFIModeEnabled()),
+          IsNonSFIModeEnabled(),
           PP_ToBool(NaClDebugEnabledForURL(manifest_url))));
   JsonManifest::ErrorInfo error_info;
   if (j->Init(manifest_data, &error_info)) {
     g_manifest_map.Get().add(manifest_id, j.Pass());
     return manifest_id;
   }
   nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
   if (load_manager)
     load_manager->ReportLoadError(error_info.error, error_info.string);
   return -1;
@@ skipping 212 matching lines @@
 
 const PPB_NaCl_Private nacl_interface = {
   &LaunchSelLdr,
   &StartPpapiProxy,
   &UrandomFD,
   &Are3DInterfacesDisabled,
   &BrokerDuplicateHandle,
   &GetReadonlyPnaclFD,
   &CreateTemporaryFile,
   &GetNumberOfProcessors,
-  &IsNonSFIModeEnabled,
+  &PPIsNonSFIModeEnabled,
   &GetNexeFd,
   &ReportTranslationFinished,
   &OpenNaClExecutable,
   &DispatchEvent,
   &NexeFileDidOpen,
   &ReportLoadSuccess,
   &ReportLoadError,
   &ReportLoadAbort,
   &NexeDidCrash,
   &InstanceCreated,
@@ skipping 27 matching lines @@
   &PostMessageToJavaScript
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl