Support non-SFI mode in NaCl manifest file.

ppapi/native_client/src/trusted/plugin/service_runtime.h

Index: ppapi/native_client/src/trusted/plugin/service_runtime.h
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
index 3094cdb310b872be72753971a021f805c3c400c5..f4b800ecc6ee3c8593cb49588b7919e7e983c41f 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
@@ -54,14 +54,16 @@ struct SelLdrStartParams {
                     bool enable_dev_interfaces,
                     bool enable_dyncode_syscalls,
                     bool enable_exception_handling,
-                    bool enable_crash_throttling)
+                    bool enable_crash_throttling,
+                    bool enable_nonsfi)
       : url(url),
         uses_irt(uses_irt),
         uses_ppapi(uses_ppapi),
         enable_dev_interfaces(enable_dev_interfaces),
         enable_dyncode_syscalls(enable_dyncode_syscalls),
         enable_exception_handling(enable_exception_handling),
-        enable_crash_throttling(enable_crash_throttling) {
+        enable_crash_throttling(enable_crash_throttling),
+        enable_nonsfi(enable_nonsfi) {
   }
   nacl::string url;
   bool uses_irt;
@@ -70,6 +72,7 @@ struct SelLdrStartParams {
   bool enable_dyncode_syscalls;
   bool enable_exception_handling;
   bool enable_crash_throttling;
+  bool enable_nonsfi;
 };
 
 // Callback resources are essentially our continuation state.
@@ -210,7 +213,8 @@ class ServiceRuntime {
   // Start method below.
   ServiceRuntime(Plugin* plugin,
                  const Manifest* manifest,
-                 bool should_report_uma,

[Mark Seaborn, 2014/02/27 17:10:22]

Renaming this should be commented in the commit message (or fixed separately)...

[hidehiko, 2014/02/28 06:41:54]

Ok, reverted.

[Mark Seaborn, 2014/03/04 04:03:32]

Would you mind preparing a separate change to fix this?  It's really helpful to
fix mistakes like this when you find them, but generally best to do it in a
separate change for clarity.

[hidehiko, 2014/03/04 15:06:33]

Sure, done. crrev.com/177353007.

On 2014/03/04 04:03:32, Mark Seaborn wrote:

+                 bool main_service_runtime,
+                 bool nonsfi_enabled,
                  pp::CompletionCallback init_done_cb,
                  pp::CompletionCallback crash_cb);
   // The destructor terminates the sel_ldr process.
@@ -266,6 +270,7 @@ class ServiceRuntime {
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
   bool main_service_runtime_;
+  bool nonsfi_enabled_;
   nacl::ReverseService* reverse_service_;
   nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_;