Support non-SFI mode in NaCl manifest file.

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

Index: ppapi/native_client/src/trusted/plugin/json_manifest.h
diff --git a/ppapi/native_client/src/trusted/plugin/json_manifest.h b/ppapi/native_client/src/trusted/plugin/json_manifest.h
index 177ad2af8c81a08ae6f94684fcbab22ec37f09c5..4a66c58a5881817ec531d02869f51d937f781152 100644
--- a/ppapi/native_client/src/trusted/plugin/json_manifest.h
+++ b/ppapi/native_client/src/trusted/plugin/json_manifest.h
@@ -30,11 +30,13 @@ class PnaclOptions;
 class JsonManifest : public Manifest {
  public:
   JsonManifest(const pp::URLUtil_Dev* url_util,
-           const nacl::string& manifest_base_url,
-           const nacl::string& sandbox_isa)
+               const nacl::string& manifest_base_url,
+               const nacl::string& sandbox_isa,
+               bool nonsfi_enabled)
       : url_util_(url_util),
         manifest_base_url_(manifest_base_url),
         sandbox_isa_(sandbox_isa),
+        nonsfi_enabled_(nonsfi_enabled),
         dictionary_(Json::nullValue) { }
   virtual ~JsonManifest() { }
 
@@ -46,6 +48,7 @@ class JsonManifest : public Manifest {
   // manifest file.
   virtual bool GetProgramURL(nacl::string* full_url,
                              PnaclOptions* pnacl_options,
+                             bool* nonsfi_enabled,
                              ErrorInfo* error_info) const;
 
   // Resolves a URL relative to the manifest base URL
@@ -86,16 +89,17 @@ class JsonManifest : public Manifest {
                                const nacl::string& parent_key,
                                nacl::string* url,
                                PnaclOptions* pnacl_options,
+                               bool* nonsfi_enabled,
                                ErrorInfo* error_info) const;
 
   const pp::URLUtil_Dev* url_util_;
   nacl::string manifest_base_url_;
   nacl::string sandbox_isa_;
+  bool nonsfi_enabled_;
 
   Json::Value dictionary_;
 };
 
-
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_