Index: trunk/src/components/nacl/browser/nacl_host_message_filter.cc |
=================================================================== |
--- trunk/src/components/nacl/browser/nacl_host_message_filter.cc (revision 285116) |
+++ trunk/src/components/nacl/browser/nacl_host_message_filter.cc (working copy) |
@@ -145,40 +145,10 @@ |
const nacl::NaClLaunchParams& launch_params, |
IPC::Message* reply_msg, |
ppapi::PpapiPermissions permissions) { |
- NaClFileToken nexe_token = { |
- launch_params.nexe_token_lo, // lo |
- launch_params.nexe_token_hi // hi |
- }; |
- |
- base::PlatformFile nexe_file; |
-#if defined(OS_WIN) |
- // Duplicate the nexe file handle from the renderer process into the browser |
- // process. |
- if (!::DuplicateHandle(PeerHandle(), |
- launch_params.nexe_file, |
- base::GetCurrentProcessHandle(), |
- &nexe_file, |
- 0, // Unused, given DUPLICATE_SAME_ACCESS. |
- FALSE, |
- DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) { |
- NaClHostMsg_LaunchNaCl::WriteReplyParams( |
- reply_msg, |
- NaClLaunchResult(), |
- std::string("Failed to duplicate nexe file handle")); |
- Send(reply_msg); |
- return; |
- } |
-#elif defined(OS_POSIX) |
- nexe_file = |
- IPC::PlatformFileForTransitToPlatformFile(launch_params.nexe_file); |
-#else |
-#error Unsupported platform. |
-#endif |
- |
NaClProcessHost* host = new NaClProcessHost( |
GURL(launch_params.manifest_url), |
- base::File(nexe_file), |
- nexe_token, |
+ base::File( |
+ IPC::PlatformFileForTransitToPlatformFile(launch_params.nexe_file)), |
permissions, |
launch_params.render_view_id, |
launch_params.permission_bits, |