Pepper: Fix caching for translated nexes.

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 45 matching lines @@
   pp::Var attrs_var(pp::PASS_REF,
                     plugin->nacl_interface()->GetCpuFeatureAttrs());
   return attrs_var.AsString();
 }
 
 void DidCacheHit(void* user_data, PP_FileHandle nexe_file_handle) {
   PnaclCoordinator* coordinator = static_cast<PnaclCoordinator*>(user_data);
   coordinator->BitcodeStreamCacheHit(nexe_file_handle);
 }
 
-void DidCacheMiss(void* user_data, int64_t expected_pexe_size) {
+void DidCacheMiss(void* user_data, int64_t expected_pexe_size,
+                  PP_FileHandle temp_nexe_file) {
   PnaclCoordinator* coordinator = static_cast<PnaclCoordinator*>(user_data);
-  coordinator->BitcodeStreamCacheMiss(expected_pexe_size);
+  coordinator->BitcodeStreamCacheMiss(expected_pexe_size,
+                                      temp_nexe_file);
 }
 
 void DidStreamData(void* user_data, const void* stream_data, int32_t length) {
   PnaclCoordinator* coordinator = static_cast<PnaclCoordinator*>(user_data);
   coordinator->BitcodeStreamGotData(stream_data, length);
 }
 
 void DidFinishStream(void* user_data, int32_t pp_error) {
   PnaclCoordinator* coordinator = static_cast<PnaclCoordinator*>(user_data);
   coordinator->BitcodeStreamDidFinish(pp_error);
@@ skipping 243 matching lines @@
         nacl::string(
             "PnaclCoordinator: Got bad temp file handle from GetNexeFd"));
     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) {
+void PnaclCoordinator::BitcodeStreamCacheMiss(int64_t expected_pexe_size,
+                                              PP_FileHandle nexe_handle) {
   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,
                        "Failed to open scratch object file.");
       return;
     } else {
       obj_files_.push_back(temp_file.release());
     }
   }
   invalid_desc_wrapper_.reset(plugin_->wrapper_factory()->MakeInvalid());
 
-  PP_FileHandle nexe_handle =
-      plugin_->nacl_interface()->CreateTemporaryFile(plugin_->pp_instance());
   temp_nexe_file_.reset(new TempFile(plugin_, nexe_handle));
   // Open the nexe file for connecting ld and sel_ldr.
   // Start translation when done with this last step of setup!
   RunTranslate(temp_nexe_file_->Open(true));
 }
 
 void PnaclCoordinator::BitcodeStreamGotData(const void* data, int32_t length) {
   DCHECK(translate_thread_.get());
 
   translate_thread_->PutBytes(data, length);
@@ skipping 88 matching lines @@
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   architecture_attributes_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin