Pepper: Simplify error reporting in PnaclResources.

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/plugin.h"
 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"

[dmichael (off chromium), 2014/06/03 19:52:51]

nit: don't need this anymore

 #include "ppapi/native_client/src/trusted/plugin/utility.h"
 
 namespace plugin {
 
 namespace {
 
 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/";
 
 nacl::string GetFullUrl(const nacl::string& partial_url) {
   return nacl::string(kPnaclBaseUrl) + GetNaClInterface()->GetSandboxArch() +
@@ skipping 11 matching lines @@
 
 void PnaclResources::ReadResourceInfo(
     const pp::CompletionCallback& resource_info_read_cb) {
   PP_Var pp_llc_tool_name_var;
   PP_Var pp_ld_tool_name_var;
   if (!plugin_->nacl_interface()->GetPnaclResourceInfo(
           plugin_->pp_instance(),
           "chrome://pnacl-translator/pnacl.json",
           &pp_llc_tool_name_var,
           &pp_ld_tool_name_var)) {
-    coordinator_->ExitWithError();
+    pp::Module::Get()->core()->CallOnMainThread(0,
+                                                resource_info_read_cb,
+                                                PP_ERROR_FAILED);
+    return;
   }
-
   pp::Var llc_tool_name(pp::PASS_REF, pp_llc_tool_name_var);
   pp::Var ld_tool_name(pp::PASS_REF, pp_ld_tool_name_var);
   llc_tool_name_ = GetFullUrl(llc_tool_name.AsString());
   ld_tool_name_ = GetFullUrl(ld_tool_name.AsString());
   pp::Module::Get()->core()->CallOnMainThread(0, resource_info_read_cb, PP_OK);
 }
 
 PP_FileHandle PnaclResources::TakeLlcFileHandle() {
   PP_FileHandle to_return = llc_file_handle_;
   llc_file_handle_ = PP_kInvalidFileHandle;
@@ skipping 12 matching lines @@
 
   // Do a blocking load of each of the resources.
   llc_file_handle_ =
       plugin_->nacl_interface()->GetReadonlyPnaclFd(llc_tool_name_.c_str());
   ld_file_handle_ =
       plugin_->nacl_interface()->GetReadonlyPnaclFd(ld_tool_name_.c_str());
 
   int32_t result = PP_OK;
   if (llc_file_handle_ == PP_kInvalidFileHandle ||
       ld_file_handle_ == PP_kInvalidFileHandle) {
-    // File-open failed. Assume this means that the file is
-    // not actually installed. This shouldn't actually occur since
-    // ReadResourceInfo() fail first.
-    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;
   }
   pp::Module::Get()->core()->CallOnMainThread(0, all_loaded_callback, result);
 }
 
 }  // namespace plugin