Refactored launching of nexes to separate file.

services/nacl/content_handler_main_nonsfi.cc

Index: services/nacl/content_handler_main_nonsfi.cc
diff --git a/services/nacl/content_handler_main_nonsfi.cc b/services/nacl/content_handler_main_nonsfi.cc
index 62a907d109070cb90133603b652c8022aa94a324..6ed35601b59816ab3c0019b17e8f6a9388c30a52 100644
--- a/services/nacl/content_handler_main_nonsfi.cc
+++ b/services/nacl/content_handler_main_nonsfi.cc
@@ -9,11 +9,9 @@
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/nacl/irt_mojo_nonsfi.h"
+#include "mojo/nacl/nexe_launcher_nonsfi.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "native_client/src/public/irt_core.h"
-#include "native_client/src/public/nonsfi/elf_loader.h"
 
 namespace nacl {
 namespace content_handler {
@@ -59,19 +57,9 @@ class NaClContentHandler : public mojo::ApplicationDelegate,
       LOG(FATAL) << "Failed to close temp file";
     }
 
-    // Run -- also, closes the fd, removing the temp file.
-    uintptr_t entry = NaClLoadElfFile(fd);
-
-    MojoSetInitialHandle(
-        application_request.PassMessagePipe().release().value());
-    int argc = 1;
-    char* argvp = const_cast<char*>("NaClMain");
-    char* envp = nullptr;
-    nacl_irt_nonsfi_entry(argc, &argvp, &envp,
-                          reinterpret_cast<nacl_entry_func_t>(entry),
-                          MojoIrtNonsfiQuery);
-    abort();
-    NOTREACHED();
+    MojoHandle h = application_request.PassMessagePipe().release().value();

[Mark Seaborn, 2015/10/02 22:31:57]

Nit: might want to avoid single-char variable names and call this "handle" or
"initial_handle".

[Sean Klein, 2015/10/02 22:41:10]

Done.

+    // MojoLaunchNexeNonsfi takes ownership of the fd.
+    MojoLaunchNexeNonsfi(fd, h);
   }
 
   mojo::ContentHandlerFactory content_handler_factory_;