Fix PNaCl on Demand load faliures.

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 257 matching lines @@
     ReportPpapiError(PP_NACL_ERROR_PNACL_CACHE_FETCH_OTHER,
                      pp_error,
                      "Failed to open translated nexe.");
     return;
   }
 
   translate_notify_callback_.Run(PP_OK);
 }
 
 void PnaclCoordinator::OpenBitcodeStream() {
-  // 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_));
-  CHECK(resources_ != NULL);
-
-  // The first step of loading resources: read the resource info file.
-  if (!resources_->ReadResourceInfo()) {
-    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.
-  if (!resources_->StartLoad()) {
-    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;
-  }
-
   // Even though we haven't started downloading, create the translation
   // thread object immediately. This ensures that any pieces of the file
   // that get downloaded before the compilation thread is accepting
   // SRPCs won't get dropped.
   translate_thread_.reset(new PnaclTranslateThread());
   if (translate_thread_ == NULL) {
     ReportNonPpapiError(
         PP_NACL_ERROR_PNACL_THREAD_CREATE,
         "PnaclCoordinator: could not allocate translation thread.");
     return;
@@ skipping 15 matching lines @@
     BitcodeStreamDidFinish(PP_ERROR_FAILED);
     return;
   }
   temp_nexe_file_.reset(new TempFile(plugin_, handle));
   // Open it for reading as the cached nexe file.
   NexeReadDidOpen(temp_nexe_file_->Open(false));
 }
 
 void PnaclCoordinator::BitcodeStreamCacheMiss(int64_t expected_pexe_size,
                                               PP_FileHandle nexe_handle) {
+  // IMPORTANT: Make sure that PnaclResources::StartLoad() is only
+  // called after you receive a response to a request for a .pexe file.
+  //
+  // 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_));
+  CHECK(resources_ != NULL);
+
+  // The first step of loading resources: read the resource info file.
+  if (!resources_->ReadResourceInfo()) {
+    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.
+  if (!resources_->StartLoad()) {
+    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;
+  }
+
   expected_pexe_size_ = expected_pexe_size;
 
   for (int i = 0; i < split_module_count_; i++) {
     PP_FileHandle obj_handle =
         plugin_->nacl_interface()->CreateTemporaryFile(plugin_->pp_instance());
     nacl::scoped_ptr<TempFile> temp_file(new TempFile(plugin_, obj_handle));
     int32_t pp_error = temp_file->Open(true);
     if (pp_error != PP_OK) {
       ReportPpapiError(PP_NACL_ERROR_PNACL_CREATE_TEMP,
                        pp_error,
@@ skipping 106 matching lines @@
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   architecture_attributes_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin