Allow PNaCl NMF to set translator optimization options for experimentation.

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 df04c886c8cb51aedf0abfef99c5c3fa1f1bdd42..e2e4fbccd651a35cf01e03c314e15351de99f679 100644
--- a/ppapi/native_client/src/trusted/plugin/json_manifest.h
+++ b/ppapi/native_client/src/trusted/plugin/json_manifest.h
@@ -25,6 +25,7 @@ class URLUtil_Dev;
 namespace plugin {
 
 class ErrorInfo;
+class PnaclOptions;
 
 class JsonManifest : public Manifest {
  public:
@@ -44,12 +45,10 @@ class JsonManifest : public Manifest {
   bool Init(const nacl::string& json, ErrorInfo* error_info);
 
   // Gets the full program URL for the current sandbox ISA from the
-  // manifest file. Sets |pnacl_translate| to |true| if the program is
-  // portable bitcode that must be translated.
+  // manifest file.
   virtual bool GetProgramURL(nacl::string* full_url,
-                             nacl::string* cache_identity,
-                             ErrorInfo* error_info,
-                             bool* pnacl_translate) const;
+                             PnaclOptions* pnacl_options,
+                             ErrorInfo* error_info) const;
 
   // Resolves a URL relative to the manifest base URL
   virtual bool ResolveURL(const nacl::string& relative_url,
@@ -64,14 +63,12 @@ class JsonManifest : public Manifest {
 
   // Resolves a key from the "files" section to a fully resolved URL,
   // i.e., relative URL values are fully expanded relative to the
-  // manifest's URL (via ResolveURL).  |pnacl_translate| tells the caller
-  // whether the resolution requires a pnacl translation step.
+  // manifest's URL (via ResolveURL).
   // If there was an error, details are reported via error_info.
   virtual bool ResolveKey(const nacl::string& key,
                           nacl::string* full_url,
-                          nacl::string* cache_identity,
-                          ErrorInfo* error_info,
-                          bool* pnacl_translate) const;
+                          PnaclOptions* pnacl_options,
+                          ErrorInfo* error_info) const;
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(JsonManifest);