Index: ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc |
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc b/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc |
index 5f3c4f0d35b2b2b7cac368f9a2d34ca9583bf1fd..f6fea1e0fd7a2ad16938234350cd8c08de56f66e 100644 |
--- a/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc |
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc |
@@ -162,13 +162,13 @@ void PnaclTranslateThread::DoTranslate() { |
pp::Core* core = pp::Module::Get()->core(); |
int64_t llc_start_time = NaClGetTimeOfDayMicroseconds(); |
- PP_FileHandle llc_file_handle = resources_->TakeLlcFileHandle(); |
- // On success, ownership of llc_file_handle is transferred. |
+ PP_NaClFileInfo llc_file_info = resources_->TakeLlcFileInfo(); |
+ // On success, ownership of llc_file_info is transferred. |
NaClSubprocess* llc_subprocess = plugin_->LoadHelperNaClModule( |
- resources_->GetLlcUrl(), llc_file_handle, &error_info); |
+ resources_->GetLlcUrl(), llc_file_info, &error_info); |
if (llc_subprocess == NULL) { |
- if (llc_file_handle != PP_kInvalidFileHandle) |
- CloseFileHandle(llc_file_handle); |
+ if (llc_file_info.handle != PP_kInvalidFileHandle) |
+ CloseFileHandle(llc_file_info.handle); |
TranslateFailed(PP_NACL_ERROR_PNACL_LLC_SETUP, |
"Compile process could not be created: " + |
error_info.message()); |
@@ -334,15 +334,15 @@ bool PnaclTranslateThread::RunLdSubprocess() { |
nacl::DescWrapper* ld_out_file = nexe_file_->write_wrapper(); |
int64_t ld_start_time = NaClGetTimeOfDayMicroseconds(); |
- PP_FileHandle ld_file_handle = resources_->TakeLdFileHandle(); |
- // On success, ownership of ld_file_handle is transferred. |
+ PP_NaClFileInfo ld_file_info = resources_->TakeLdFileInfo(); |
+ // On success, ownership of ld_file_info is transferred. |
nacl::scoped_ptr<NaClSubprocess> ld_subprocess( |
plugin_->LoadHelperNaClModule(resources_->GetLlcUrl(), |
- ld_file_handle, |
+ ld_file_info, |
&error_info)); |
if (ld_subprocess.get() == NULL) { |
- if (ld_file_handle != PP_kInvalidFileHandle) |
- CloseFileHandle(ld_file_handle); |
+ if (ld_file_info.handle != PP_kInvalidFileHandle) |
+ CloseFileHandle(ld_file_info.handle); |
TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP, |
"Link process could not be created: " + |
error_info.message()); |