Support non-SFI mode in NaCl manifest file.

ppapi/native_client/src/trusted/plugin/plugin.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.
 
 // The portable representation of an instance and root scriptable object.
 // The PPAPI version of the plugin instantiates a subclass of this class.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
@@ skipping 71 matching lines @@
   //
   // NB: currently we do not time out, so if the untrusted code
   // does not signal that it is ready, then we will deadlock the main
   // thread of the renderer on this subsequent event delivery.  We
   // should include a time-out at which point we declare the
   // nacl_ready_state to be done, and let the normal crash detection
   // mechanism(s) take over.
   //
   // Updates nacl_module_origin() and nacl_module_url().
   void LoadNaClModule(nacl::DescWrapper* wrapper,
+                      bool uses_nonsfi_mode,
                       bool enable_dyncode_syscalls,
                       bool enable_exception_handling,
                       bool enable_crash_throttling,
                       const pp::CompletionCallback& init_done_cb,
                       const pp::CompletionCallback& crash_cb);
 
   // Finish hooking interfaces up, after low-level initialization is
   // complete.
   bool LoadNaClModuleContinuationIntern(ErrorInfo* error_info);
 
@@ skipping 70 matching lines @@
     // The manifest file has been requested, but not yet received.
     OPENED = 1,
     // This state is unused.
     HEADERS_RECEIVED = 2,
     // The manifest file has been received and the nexe successfully requested.
     LOADING = 3,
     // The nexe has been loaded and the proxy started, so it is ready for
     // interaction with the page.
     DONE = 4
   };
+
   bool nexe_error_reported() const { return nexe_error_reported_; }
   void set_nexe_error_reported(bool val) {
     nexe_error_reported_ = val;
   }
 
   nacl::DescWrapperFactory* wrapper_factory() const { return wrapper_factory_; }
 
   // Requests a NaCl manifest download from a |url| relative to the page origin.
   void RequestNaClManifest(const nacl::string& url);
 
@@ skipping 189 matching lines @@
   void SetExitStatusOnMainThread(int32_t pp_error, int exit_status);
 
   std::map<std::string, std::string> args_;
 
   // Keep track of the NaCl module subprocess that was spun up in the plugin.
   NaClSubprocess main_subprocess_;
 
   nacl::string plugin_base_url_;
   nacl::string manifest_base_url_;
   nacl::string manifest_url_;
+  bool uses_nonsfi_mode_;
   ReadyState nacl_ready_state_;
   bool nexe_error_reported_;  // error or crash reported
 
   nacl::DescWrapperFactory* wrapper_factory_;
 
   // File download support.  |nexe_downloader_| can be opened with a specific
   // callback to run when the file has been downloaded and is opened for
   // reading.  We use one downloader for all URL downloads to prevent issuing
   // multiple GETs that might arrive out of order.  For example, this will
   // prevent a GET of a NaCl manifest while a .nexe GET is pending.  Note that
@@ skipping 64 matching lines @@
   int64_t time_of_last_progress_event_;
   int exit_status_;
 
   const PPB_NaCl_Private* nacl_interface_;
   pp::UMAPrivate uma_interface_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_