Pepper: Remove Manifest::ResolveURL

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

Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
index 40a2060c75e6e78c7c055bcb0af33482f0d4e26a..9028b524b07e97875ceb57fda00c2ec02a5c3c83 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
@@ -38,8 +38,7 @@ namespace plugin {
 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() { }
 
@@ -58,16 +57,6 @@ class PnaclManifest : public Manifest {
     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"));
@@ -92,14 +81,13 @@ class PnaclManifest : public Manifest {
     // 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_;
 };
 
@@ -451,7 +439,7 @@ void PnaclCoordinator::BitcodeStreamDidOpen(int32_t pp_error) {
   // 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.