Pepper: Move GetSandboxISA() to PPB_NaCl_Private.

ppapi/native_client/src/trusted/plugin/pnacl_resources.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_resources.h"
 
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/native_client/src/trusted/plugin/file_utils.h"
 #include "ppapi/native_client/src/trusted/plugin/manifest.h"
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"
 #include "ppapi/native_client/src/trusted/plugin/utility.h"
 #include "third_party/jsoncpp/source/include/json/reader.h"
 #include "third_party/jsoncpp/source/include/json/value.h"
 
 namespace plugin {
+namespace {
+const PPB_NaCl_Private* GetNaClInterface() {
+  pp::Module *module = pp::Module::Get();
+  CHECK(module);
+  return static_cast<const PPB_NaCl_Private*>(
+      module->GetBrowserInterface(PPB_NACL_PRIVATE_INTERFACE));
+}
+}  // namespace
 
 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/";
 const char PnaclUrls::kResourceInfoUrl[] = "pnacl.json";
 
 nacl::string PnaclUrls::GetBaseUrl() {
   return nacl::string(kPnaclBaseUrl);
 }
 
 nacl::string PnaclUrls::PrependPlatformPrefix(const nacl::string& url) {
-  return nacl::string(GetSandboxISA()) + "/" + url;
+  return nacl::string(GetNaClInterface()->GetSandboxISA()) + "/" + url;
 }
 
 // Determine if a URL is for a pnacl-component file, or if it is some other
 // type of URL (e.g., http://, https://, chrome-extension://).
 // The URL could be one of the other variants for shared libraries
 // served from the web.
 bool PnaclUrls::IsPnaclComponent(const nacl::string& full_url) {
   return full_url.find(kPnaclBaseUrl, 0) == 0;
 }
 
@@ skipping 199 matching lines @@
       resource_wrappers_[resource_urls[i]] =
           plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY);
     }
   }
   // We're done!  Queue the callback.
   pp::Core* core = pp::Module::Get()->core();
   core->CallOnMainThread(0, all_loaded_callback, result);
 }
 
 }  // namespace plugin