Pepper: Move GetSandboxISA() to PPB_NaCl_Private.

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.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.
 
 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/checked_cast.h"
@@ skipping 19 matching lines @@
 //  Pnacl-specific manifest support.
 //////////////////////////////////////////////////////////////////////
 
 // The PNaCl linker gets file descriptors via the service runtime's
 // reverse service lookup.  The reverse service lookup requires a manifest.
 // Normally, that manifest is an NMF containing mappings for shared libraries.
 // Here, we provide a manifest that redirects to PNaCl component files
 // that are part of Chrome.
 class PnaclManifest : public Manifest {
  public:
-  PnaclManifest() : manifest_base_url_(PnaclUrls::GetBaseUrl()) { }
+  PnaclManifest(const nacl::string& sandbox_arch)
+      : manifest_base_url_(PnaclUrls::GetBaseUrl()),
+        sandbox_arch_(sandbox_arch) { }
+
   virtual ~PnaclManifest() { }
 
   virtual bool GetProgramURL(nacl::string* full_url,
                              PnaclOptions* pnacl_options,
                              bool* uses_nonsfi_mode,
                              ErrorInfo* error_info) const {
     // Does not contain program urls.
     UNREFERENCED_PARAMETER(full_url);
     UNREFERENCED_PARAMETER(pnacl_options);
     UNREFERENCED_PARAMETER(uses_nonsfi_mode);
@@ skipping 31 matching lines @@
     const nacl::string kFilesPrefix = "files/";
     size_t files_prefix_pos = key.find(kFilesPrefix);
     if (files_prefix_pos == nacl::string::npos) {
       error_info->SetReport(PP_NACL_ERROR_MANIFEST_RESOLVE_URL,
                             "key did not start with files/");
       return false;
     }
     // Resolve the full URL to the file. Provide it with a platform-specific
     // prefix.
     nacl::string key_basename = key.substr(kFilesPrefix.length());
-    return ResolveURL(PnaclUrls::PrependPlatformPrefix(key_basename),
+    return ResolveURL(sandbox_arch_ + "/" + key_basename,
                       full_url, error_info);
   }
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PnaclManifest);
 
   nacl::string manifest_base_url_;
+  nacl::string sandbox_arch_;
 };
 
 //////////////////////////////////////////////////////////////////////
 //  UMA stat helpers.
 //////////////////////////////////////////////////////////////////////
 
 namespace {
 
 // Assume translation time metrics *can be* large.
 // Up to 12 minutes.
@@ skipping 105 matching lines @@
 
 PnaclCoordinator::PnaclCoordinator(
     Plugin* plugin,
     const nacl::string& pexe_url,
     const PnaclOptions& pnacl_options,
     const pp::CompletionCallback& translate_notify_callback)
   : translate_finish_error_(PP_OK),
     plugin_(plugin),
     translate_notify_callback_(translate_notify_callback),
     translation_finished_reported_(false),
-    manifest_(new PnaclManifest()),
+    manifest_(new PnaclManifest(plugin->nacl_interface()->GetSandboxArch())),
     pexe_url_(pexe_url),
     pnacl_options_(pnacl_options),
     split_module_count_(1),
     num_object_files_opened_(0),
     is_cache_hit_(PP_FALSE),
     error_already_reported_(false),
     pnacl_init_time_(0),
     pexe_size_(0),
     pexe_bytes_compiled_(0),
     expected_pexe_size_(-1) {
@@ skipping 265 matching lines @@
       plugin_->nacl_interface()->GetNexeFd(
           plugin_->pp_instance(),
           streaming_downloader_->full_url().c_str(),
           // TODO(dschuff): Get this value from the pnacl json file after it
           // rolls in from NaCl.
           1,
           pnacl_options_.opt_level(),
           parser.GetHeader("last-modified").c_str(),
           parser.GetHeader("etag").c_str(),
           PP_FromBool(parser.CacheControlNoStore()),
-          GetSandboxISA(),
+          plugin_->nacl_interface()->GetSandboxArch(),
           "", // No extra compile flags yet.
           &is_cache_hit_,
           temp_nexe_file_->existing_handle(),
           cb.pp_completion_callback());
   if (nexe_fd_err < PP_OK_COMPLETIONPENDING) {
     ReportPpapiError(PP_NACL_ERROR_PNACL_CREATE_TEMP, nexe_fd_err,
                      nacl::string("Call to GetNexeFd failed"));
   }
 }
 
@@ skipping 168 matching lines @@
                                   temp_nexe_file_.get(),
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin