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 6760345c2f084e1ce99ef147706d605a2068a7d3..73612452abb4eb492eb6ea4b12fbe02ef612cb6e 100644
--- a/ppapi/native_client/src/trusted/plugin/json_manifest.h
+++ b/ppapi/native_client/src/trusted/plugin/json_manifest.h
@@ -32,10 +32,12 @@ class JsonManifest : public Manifest {
   JsonManifest(const pp::URLUtil_Dev* url_util,
                const nacl::string& manifest_base_url,
                const nacl::string& sandbox_isa,
+               bool nonsfi_enabled,
                bool pnacl_debug)
       : url_util_(url_util),
         manifest_base_url_(manifest_base_url),
         sandbox_isa_(sandbox_isa),
+        nonsfi_enabled_(nonsfi_enabled),
         dictionary_(Json::nullValue),
         pnacl_debug_(pnacl_debug) { }
   virtual ~JsonManifest() { }
@@ -48,6 +50,7 @@ class JsonManifest : public Manifest {
   // manifest file.
   virtual bool GetProgramURL(nacl::string* full_url,
                              PnaclOptions* pnacl_options,
+                             bool* uses_nonsfi_mode,
                              ErrorInfo* error_info) const;
 
   // Resolves a URL relative to the manifest base URL
@@ -88,17 +91,18 @@ class JsonManifest : public Manifest {
                                const nacl::string& parent_key,
                                nacl::string* url,
                                PnaclOptions* pnacl_options,
+                               bool* uses_nonsfi_mode,
                                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_;
   bool pnacl_debug_;  // Search for a pnacl-debug entry.
 };
 
-
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_