Refactored launching of nexes to separate file.

services/nacl/content_handler_main_nonsfi.cc

 // Copyright 2015 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 <fcntl.h>
 
 #include "base/files/file_util.h"
 #include "mojo/application/application_runner_chromium.h"
 #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 {
 
 class NaClContentHandler : public mojo::ApplicationDelegate,
                            public mojo::ContentHandlerFactory::Delegate {
  public:
   NaClContentHandler() : content_handler_factory_(this) {}
 
  private:
@@ skipping 25 matching lines @@
       LOG(FATAL) << "Could not open the stream pointer's file descriptor";
     }
     fd = dup(fd);
     if (fd == -1) {
       LOG(FATAL) << "Could not dup the file descriptor";
     }
     if (fclose(nexe_file_stream)) {
       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();
+    // launch_nexe_nonsfi takes ownership of the fd.
+    launch_nexe_nonsfi(fd, h);
   }
 
   mojo::ContentHandlerFactory content_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClContentHandler);
 };
 
 }  // namespace content_handler
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new nacl::content_handler::NaClContentHandler());
   return runner.Run(application_request);
 }