Support non-SFI mode in NaCl manifest file.

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

 /* -*- c++ -*- */
 /*
  * Copyright (c) 2012 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.
  */
 
 // A class containing information regarding a socket connection to a
 // service runtime instance.
 
@@ skipping 36 matching lines @@
 
 // Struct of params used by StartSelLdr.  Use a struct so that callback
 // creation templates aren't overwhelmed with too many parameters.
 struct SelLdrStartParams {
   SelLdrStartParams(const nacl::string& url,
                     bool uses_irt,
                     bool uses_ppapi,
                     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;
   bool uses_ppapi;
   bool enable_dev_interfaces;
   bool enable_dyncode_syscalls;
   bool enable_exception_handling;
   bool enable_crash_throttling;
+  bool enable_nonsfi;
 };
 
 // Callback resources are essentially our continuation state.
 struct PostMessageResource {
  public:
   explicit PostMessageResource(std::string msg)
       : message(msg) {}
   std::string message;
 };
 
@@ skipping 120 matching lines @@
   pp::CompletionCallback crash_cb_;
 };
 
 //  ServiceRuntime abstracts a NativeClient sel_ldr instance.
 class ServiceRuntime {
  public:
   // TODO(sehr): This class should also implement factory methods, using the
   // 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.
   ~ServiceRuntime();
 
   // Spawn the sel_ldr instance.
   void StartSelLdr(const SelLdrStartParams& params,
                    pp::CompletionCallback callback);
 
   // If starting sel_ldr from a background thread, wait for sel_ldr to
@@ skipping 35 matching lines @@
   NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
   bool LoadModule(nacl::DescWrapper* shm, ErrorInfo* error_info);
   bool InitReverseService(ErrorInfo* error_info);
   bool StartModule(ErrorInfo* error_info);
   void StartSelLdrContinuation(int32_t pp_error,
                                pp::CompletionCallback callback);
 
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
   bool main_service_runtime_;
+  bool nonsfi_enabled_;
   nacl::ReverseService* reverse_service_;
   nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_;
 
   nacl::WeakRefAnchor* anchor_;
 
   PluginReverseInterface* rev_interface_;
 
   // Mutex to protect exit_status_.
   // Also, in conjunction with cond_ it is used to signal when
   // StartSelLdr is complete with either success or error.
   NaClMutex mu_;
   NaClCondVar cond_;
   int exit_status_;
   bool start_sel_ldr_done_;
 
   PP_Var start_sel_ldr_error_message_;
   pp::CompletionCallbackFactory<ServiceRuntime> callback_factory_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_