Pepper: Remove Manifest::ResolveURL

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 20 matching lines @@
 //////////////////////////////////////////////////////////////////////
 
 // 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(const nacl::string& sandbox_arch)
-      : manifest_base_url_(PnaclUrls::GetBaseUrl()),
-        sandbox_arch_(sandbox_arch) { }
+      : 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);
     UNREFERENCED_PARAMETER(error_info);
     PLUGIN_PRINTF(("PnaclManifest does not contain a program\n"));
     error_info->SetReport(PP_NACL_ERROR_MANIFEST_GET_NEXE_URL,
                           "pnacl manifest does not contain a program.");
     return false;
   }
 
-  virtual bool ResolveURL(const nacl::string& relative_url,
-                          nacl::string* full_url,
-                          ErrorInfo* error_info) const {
-    // Does not do general URL resolution, simply appends relative_url to
-    // the end of manifest_base_url_.
-    UNREFERENCED_PARAMETER(error_info);
-    *full_url = manifest_base_url_ + relative_url;
-    return true;
-  }
-
   virtual bool GetFileKeys(std::set<nacl::string>* keys) const {
     // Does not support enumeration.
     PLUGIN_PRINTF(("PnaclManifest does not support key enumeration\n"));
     UNREFERENCED_PARAMETER(keys);
     return false;
   }
 
   virtual bool ResolveKey(const nacl::string& key,
                           nacl::string* full_url,
                           PnaclOptions* pnacl_options,
                           ErrorInfo* error_info) const {
     // All of the component files are native (do not require pnacl translate).
     pnacl_options->set_translate(false);
     // We can only resolve keys in the files/ namespace.
     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(sandbox_arch_ + "/" + key_basename,
-                      full_url, error_info);
+    *full_url = PnaclUrls::GetBaseUrl() + sandbox_arch_ + "/" + key_basename;
+    return true;
   }
 
  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.
@@ skipping 331 matching lines @@
     BitcodeStreamDidFinish(pp_error);
     // We have not spun up the translation process yet, so we need to call
     // TranslateFinished here.
     TranslateFinished(pp_error);
     return;
   }
 
   // The component updater's resource throttles + OnDemand update/install
   // should block the URL request until the compiler is present. Now we
   // can load the resources (e.g. llc and ld nexes).
-  resources_.reset(new PnaclResources(plugin_, this, this->manifest_.get()));
+  resources_.reset(new PnaclResources(plugin_, this));
   CHECK(resources_ != NULL);
 
   // The first step of loading resources: read the resource info file.
   pp::CompletionCallback resource_info_read_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ResourceInfoWasRead);
   resources_->ReadResourceInfo(PnaclUrls::GetResourceInfoUrl(),
                                resource_info_read_cb);
 }
 
 void PnaclCoordinator::ResourceInfoWasRead(int32_t pp_error) {
@@ skipping 235 matching lines @@
                                   temp_nexe_file_.get(),
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin