Avoid blocking the PNaCl translator processes when chrome NaCl GDB flag is on.

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 {
 
-static const char kPnaclComponentScheme[] = "pnacl-component://";
+static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/";
 const char PnaclUrls::kResourceInfoUrl[] = "pnacl.json";
 
 nacl::string PnaclUrls::GetBaseUrl() {
-  return nacl::string(kPnaclComponentScheme);
+  return nacl::string(kPnaclBaseUrl);
 }
 
 nacl::string PnaclUrls::PrependPlatformPrefix(const nacl::string& url) {
   return nacl::string(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(kPnaclComponentScheme, 0) == 0;
+  return full_url.find(kPnaclBaseUrl, 0) == 0;
 }
 
 // Convert a URL to a filename accepted by GetReadonlyPnaclFd.
 // Must be kept in sync with chrome/browser/nacl_host/nacl_file_host.
 nacl::string PnaclUrls::PnaclComponentURLToFilename(
     const nacl::string& full_url) {
   // strip component scheme.
-  nacl::string r = full_url.substr(
-      nacl::string(kPnaclComponentScheme).length());
+  nacl::string r = full_url.substr(nacl::string(kPnaclBaseUrl).length());
 
   // Use white-listed-chars.
   size_t replace_pos;
   static const char* white_list = "abcdefghijklmnopqrstuvwxyz0123456789_";
   replace_pos = r.find_first_not_of(white_list);
   while(replace_pos != nacl::string::npos) {
     r = r.replace(replace_pos, 1, "_");
     replace_pos = r.find_first_not_of(white_list);
   }
   return r;
@@ skipping 125 matching lines @@
     Json::Value json_name = json_data["pnacl-ld-name"];
     if (json_name.isString()) {
       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 full_url;
+  ErrorInfo error_info;
+  const nacl::string& url_with_platform_prefix =
+      PnaclUrls::PrependPlatformPrefix(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 "";
+  }
+  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());
 
   PLUGIN_PRINTF(("PnaclResources::StartLoad -- local install of PNaCl.\n"));
   // Do a blocking load of each of the resources.
   int32_t result = PP_OK;
   for (size_t i = 0; i < resource_urls.size(); ++i) {
-    const nacl::string& url_with_platform_prefix =
-      PnaclUrls::PrependPlatformPrefix(resource_urls[i]);
-    nacl::string full_url;
-    ErrorInfo error_info;
-    if (!manifest_->ResolveURL(url_with_platform_prefix, &full_url,
-                               &error_info)) {
+    nacl::string full_url = GetFullUrl(resource_urls[i]);
+    if (full_url == "") {
       coordinator_->ReportNonPpapiError(
           PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
-          nacl::string("failed to resolve ") +
-          url_with_platform_prefix + ": " +
-          error_info.message() + ".");
+          nacl::string("failed to resolve ") + resource_urls[i] + ".");
       break;
     }
     nacl::string filename = PnaclUrls::PnaclComponentURLToFilename(full_url);
 
     int32_t fd = PnaclResources::GetPnaclFD(plugin_, filename.c_str());
     if (fd < 0) {
       // File-open failed. Assume this means that the file is
       // not actually installed. This shouldn't actually occur since
       // ReadResourceInfo() should happen first, and error out.
       coordinator_->ReportNonPpapiError(
           PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
         nacl::string("The Portable Native Client (pnacl) component is not "
                      "installed. Please consult chrome://components for more "
                      "information."));
       result = PP_ERROR_FILENOTFOUND;
       break;
     } else {
       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