Revert 284766 "Pepper: Simplify TempFile in trusted plugin."

trunk/src/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 320 matching lines @@
 void PnaclCoordinator::BitcodeStreamCacheHit(PP_FileHandle handle) {
   HistogramEnumerateTranslationCache(plugin_->uma_interface(), true);
   if (handle == PP_kInvalidFileHandle) {
     ReportNonPpapiError(
         PP_NACL_ERROR_PNACL_CREATE_TEMP,
         nacl::string(
             "PnaclCoordinator: Got bad temp file handle from GetNexeFd"));
     BitcodeStreamDidFinish(PP_ERROR_FAILED);
     return;
   }
-  temp_nexe_file_.reset(new TempFile(plugin_, handle));
+  *temp_nexe_file_->internal_handle() = handle;
+  // Open it for reading as the cached nexe file.
   NexeReadDidOpen(temp_nexe_file_->Open(false));
 }
 
 void PnaclCoordinator::BitcodeStreamCacheMiss(int64_t expected_pexe_size) {
   HistogramEnumerateTranslationCache(plugin_->uma_interface(), false);
   expected_pexe_size_ = expected_pexe_size;
 
+  // Open an object file first so the translator can start writing to it
+  // during streaming translation.
+  temp_nexe_file_.reset(new TempFile(plugin_));
+
   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));
+    nacl::scoped_ptr<TempFile> temp_file(new TempFile(plugin_));
     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());
 
   // Open the nexe file for connecting ld and sel_ldr.
   // Start translation when done with this last step of setup!
-  PP_FileHandle nexe_handle =
-      plugin_->nacl_interface()->CreateTemporaryFile(plugin_->pp_instance());
-  temp_nexe_file_.reset(new TempFile(plugin_, nexe_handle));
   RunTranslate(temp_nexe_file_->Open(true));
 }
 
 void PnaclCoordinator::BitcodeStreamGotData(const void* data, int32_t length) {
   DCHECK(translate_thread_.get());
 
   translate_thread_->PutBytes(data, length);
   if (data && length > 0)
     pexe_size_ += length;
 }
@@ skipping 85 matching lines @@
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   architecture_attributes_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin