Split SelLdrLauncher into SelLdrLauncher{Standalone,Chrome} classes

src/trusted/nonnacl_util/posix/sel_ldr_launcher_posix.cc

 /*
  * Copyright (c) 2012 The Native Client 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 <sys/types.h>
 #include <sys/wait.h>
 
@@ skipping 12 matching lines @@
 #include "native_client/src/shared/platform/nacl_exit.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 
 
 using std::vector;
 
 namespace nacl {
 
-SelLdrLauncher::~SelLdrLauncher() {
+SelLdrLauncherStandalone::~SelLdrLauncherStandalone() {
   CloseHandlesAfterLaunch();
-#if defined(NACL_STANDALONE)
   if (kInvalidHandle != child_process_) {
     int status;
     // Ensure child process (service runtime) is kaput.  NB: we might
     // close the command channel (or use the hard_shutdown RPC) rather
     // than killing the process to allow the service runtime to do
     // clean up, but the plugin should be responsible for that and we
     // shouldn't introduce any timeout wait in a dtor.  Currently,
     // ServiceRuntime::Shutdown kills the subprocess before closing
     // the command channel, so we aren't providing the opportunity for
     // a more graceful shutdown.
     KillChildProcess();
     waitpid(child_process_, &status, 0);
   }
-#endif
-  if (kInvalidHandle != channel_) {
-    Close(channel_);
-  }
 }
 
 
-nacl::string SelLdrLauncher::GetSelLdrPathName() {
+nacl::string SelLdrLauncherStandalone::GetSelLdrPathName() {
   char buffer[FILENAME_MAX];
   GetPluginDirectory(buffer, sizeof(buffer));
   return nacl::string(buffer) + "/sel_ldr";
 }
 
-nacl::string SelLdrLauncher::GetSelLdrBootstrapPathName() {
+nacl::string SelLdrLauncherStandalone::GetSelLdrBootstrapPathName() {
 #if NACL_LINUX
   char buffer[FILENAME_MAX];
   GetPluginDirectory(buffer, sizeof(buffer));
   return nacl::string(buffer) + "/nacl_helper_bootstrap";
 #else
   return nacl::string(NACL_NO_FILE_PATH);
 #endif
 }
 
-Handle SelLdrLauncher::CreateBootstrapSocket(nacl::string* dest_fd) {
+Handle SelLdrLauncherStandalone::CreateBootstrapSocket(nacl::string* dest_fd) {
   Handle pair[2];
   if (SocketPair(pair) == -1) {
     return kInvalidHandle;
   }
 
   int rc = fcntl(pair[0], F_SETFD, FD_CLOEXEC);
   CHECK(rc == 0);
   close_after_launch_.push_back(pair[1]);
 
   *dest_fd = ToString(pair[1]);
   return pair[0];
 }
 
 const size_t kMaxExecArgs = 64;
 
-#if defined(NACL_STANDALONE)
-bool SelLdrLauncher::StartViaCommandLine(
+bool SelLdrLauncherStandalone::StartViaCommandLine(
     const vector<nacl::string>& prefix,
     const vector<nacl::string>& sel_ldr_argv,
     const vector<nacl::string>& app_argv) {
   // Set up the command line.
   InitCommandLine(prefix, sel_ldr_argv, app_argv);
   // complete command line setup
   vector<nacl::string> command;
   BuildCommandLine(&command);
   if (kMaxExecArgs <= command.size()) {
     // TODO(robertm): emit error message
@@ skipping 22 matching lines @@
     NaClLog(LOG_ERROR, "execv failed, args were:\n");
     for (size_t i = 0; i < command.size(); ++i) {
       NaClLog(LOG_ERROR, "%s\n", argv[i]);
     }
     perror("execv");
     NaClExit(EXIT_FAILURE);
   }
   CloseHandlesAfterLaunch();
   return true;
 }
-#endif
 
-bool SelLdrLauncher::KillChildProcess() {
-#if defined(NACL_STANDALONE)
+bool SelLdrLauncherStandalone::KillChildProcess() {
   if (kInvalidHandle == child_process_) {
     // It is incorrect to use the kill syscall on kInvalidHandle as
     // the pid, since using -1 as pid is defined by POSIX.1-2001 to
     // send the signal (SIGKILL) to every process that the calling
     // process may send signals to (except for init), which is
     // Definitely Not What Was Intended for this.
     return true;
   }
   return 0 == kill(child_process_, SIGKILL);
   // We cannot set child_process_ to kInvalidHandle since we will want to wait
   // on its exit status.
-#else
-  return false;
-#endif
 }
 
 }  // namespace nacl