Pepper: Remove Manifest::ResolveURL

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"
@@ skipping 78 matching lines @@
 nacl::DescWrapper* PnaclResources::WrapperForUrl(const nacl::string& url) {
   CHECK(resource_wrappers_.find(url) != resource_wrappers_.end());
   return resource_wrappers_[url];
 }
 
 void PnaclResources::ReadResourceInfo(
     const nacl::string& resource_info_url,
     const pp::CompletionCallback& resource_info_read_cb) {
   PLUGIN_PRINTF(("PnaclResources::ReadResourceInfo\n"));
 
-  nacl::string full_url;
-  ErrorInfo error_info;
-  if (!manifest_->ResolveURL(resource_info_url, &full_url, &error_info)) {
-    ReadResourceInfoError(nacl::string("failed to resolve ") +
-                          resource_info_url + ": " +
-                          error_info.message() + ".");
-    return;
-  }
+  nacl::string full_url = PnaclUrls::GetBaseUrl() + resource_info_url;
   PLUGIN_PRINTF(("Resolved resources info url: %s\n", full_url.c_str()));
   nacl::string resource_info_filename =
     PnaclUrls::PnaclComponentURLToFilename(full_url);
 
   PLUGIN_PRINTF(("Pnacl-converted resources info url: %s\n",
                  resource_info_filename.c_str()));
 
   int32_t fd = GetPnaclFD(plugin_, resource_info_filename.c_str());
   if (fd < 0) {
     // File-open failed. Assume this means that the file is
@@ skipping 62 matching lines @@
       ld_tool_name = json_name.asString();
       PLUGIN_PRINTF(("Set ld_tool_name=%s\n", ld_tool_name.c_str()));
     }
   }
 
   return true;
 }
 
 nacl::string PnaclResources::GetFullUrl(
     const nacl::string& partial_url, const nacl::string& sandbox_arch) const {
-  nacl::string full_url;
-  ErrorInfo error_info;
   const nacl::string& url_with_platform_prefix =
       sandbox_arch + "/" + partial_url;
-  if (!manifest_->ResolveURL(url_with_platform_prefix,
-                             &full_url,
-                             &error_info)) {
-    PLUGIN_PRINTF(("PnaclResources::GetFullUrl failed: %s.\n",
-                   error_info.message().c_str()));
-    return "";
-  }
+  nacl::string full_url = PnaclUrls::GetBaseUrl() + url_with_platform_prefix;
   return full_url;
 }
 
 void PnaclResources::StartLoad(
     const pp::CompletionCallback& all_loaded_callback) {
   PLUGIN_PRINTF(("PnaclResources::StartLoad\n"));
 
   std::vector<nacl::string> resource_urls;
   resource_urls.push_back(GetLlcUrl());
   resource_urls.push_back(GetLdUrl());
@@ skipping 28 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