Pepper: Simplify error reporting in PnaclResources.

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 358 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));
+  resources_.reset(new PnaclResources(plugin_));
   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(resource_info_read_cb);
 }
 
 void PnaclCoordinator::ResourceInfoWasRead(int32_t pp_error) {
   PLUGIN_PRINTF(("PluginCoordinator::ResourceInfoWasRead (pp_error=%"
                 NACL_PRId32 ")\n", pp_error));
+  if (pp_error != PP_OK) {
+    ExitWithError();
+    return;
+  }
   // Second step of loading resources: call StartLoad to load pnacl-llc
   // and pnacl-ld, based on the filenames found in the resource info file.
   pp::CompletionCallback resources_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ResourcesDidLoad);
   resources_->StartLoad(resources_cb);
 }
 
 void PnaclCoordinator::ResourcesDidLoad(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::ResourcesDidLoad (pp_error=%"
                  NACL_PRId32 ")\n", pp_error));
   if (pp_error != PP_OK) {
-    // Finer-grained error code should have already been reported by
-    // the PnaclResources class.
+    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."));
     return;
   }
 
   // Okay, now that we've started the HTTP request for the pexe
   // and we've ensured that the PNaCl compiler + metadata is installed,
   // get the cache key from the response headers and from the
   // compiler's version metadata.
   nacl::string headers = streaming_downloader_->GetResponseHeaders();
 
   temp_nexe_file_.reset(new TempFile(plugin_));
@@ skipping 192 matching lines @@
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   architecture_attributes_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin