Allow PNaCl NMF to set translator optimization options for experimentation.

This adds two fields:
(1) "-O": i
(2) "experimentation_flags": "arbitrary flags"

We may want to remove (2) soon... or just omit it.
The optimization flag is separated and made a uint so that
it can be tracked as a UMA stat more easily.

Also set default to -O0 for now.



TEST= browser_tests --gtest_filter=*Pnacl*Options*

This only tests that the plugin doesn't barf on those
new NMF options. To really test it we'd need to instrument
LLC to know that it's really getting these flags and get
output from LLC confirming that.  For now I have a manual
test:
http://www/~jvoung/IrrLicht/testirrnacl_portable.html
showing that it works though.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=3325

Review URL: https://chromiumcodereview.appspot.com/12623004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187764 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 10 deletions

diff --git a/ppapi/native_client/src/trusted/plugin/json_manifest.h b/ppapi/native_client/src/trusted/plugin/json_manifest.h
index df04c88..e2e4fbc 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);