Allow PNaCl NMF to set translator optimization options for experimentation.

ppapi/native_client/src/trusted/plugin/plugin.cc

 // 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.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "native_client/src/trusted/plugin/plugin.h"
@@ skipping 1156 matching lines @@
   // No need to close |file_desc|, that is handled by |nexe_downloader_|.
   json_buffer[total_bytes_read] = '\0';  // Force null termination.
 
   ProcessNaClManifest(json_buffer.get());
 }
 
 void Plugin::ProcessNaClManifest(const nacl::string& manifest_json) {
   HistogramSizeKB("NaCl.Perf.Size.Manifest",
                   static_cast<int32_t>(manifest_json.length() / 1024));
   nacl::string program_url;
-  nacl::string cache_identity;
-  bool is_portable;
+  PnaclOptions pnacl_options;
   ErrorInfo error_info;
   if (!SetManifestObject(manifest_json, &error_info)) {
     ReportLoadError(error_info);
     return;
   }
 
-  if (manifest_->GetProgramURL(&program_url, &cache_identity,
-                               &error_info, &is_portable)) {
+  if (manifest_->GetProgramURL(&program_url, &pnacl_options, &error_info)) {
     is_installed_ = GetUrlScheme(program_url) == SCHEME_CHROME_EXTENSION;
     set_nacl_ready_state(LOADING);
     // Inform JavaScript that we found a nexe URL to load.
     EnqueueProgressEvent(kProgressEventProgress);
-    if (is_portable) {
+    if (pnacl_options.translate()) {
       if (this->nacl_interface()->IsPnaclEnabled()) {
         pp::CompletionCallback translate_callback =
             callback_factory_.NewCallback(&Plugin::BitcodeDidTranslate);
         // Will always call the callback on success or failure.
         pnacl_coordinator_.reset(
             PnaclCoordinator::BitcodeToNative(this,
                                               program_url,
-                                              cache_identity,
+                                              pnacl_options,
                                               translate_callback));
         return;
       } else {
         error_info.SetReport(ERROR_PNACL_NOT_ENABLED,
                              "PNaCl has not been enabled (e.g., by setting "
                              "the --enable-pnacl flag).");
       }
     } else {
       pp::CompletionCallback open_callback =
           callback_factory_.NewCallback(&Plugin::NexeFileDidOpen);
@@ skipping 416 matching lines @@
                                           static_cast<uint32_t>(text.size()));
   const PPB_Console* console_interface =
       static_cast<const PPB_Console*>(
           module->GetBrowserInterface(PPB_CONSOLE_INTERFACE));
   console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str);
   var_interface->Release(prefix);
   var_interface->Release(str);
 }
 
 }  // namespace plugin