Pepper: SelLdrLauncherChrome cleanup.

ppapi/native_client/src/trusted/plugin/service_runtime.cc

 /*
  * Copyright (c) 2012 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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
 
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 244 matching lines @@
     : plugin_(plugin),
       pp_instance_(pp_instance),
       main_service_runtime_(main_service_runtime),
       uses_nonsfi_mode_(uses_nonsfi_mode),
       reverse_service_(NULL),
       anchor_(new nacl::WeakRefAnchor()),
       rev_interface_(new PluginReverseInterface(anchor_, pp_instance, this,
                                                 init_done_cb, crash_cb)),
       start_sel_ldr_done_(false),
       start_nexe_done_(false),
-      nexe_started_ok_(false) {
+      nexe_started_ok_(false),
+      bootstrap_channel_(NACL_INVALID_HANDLE) {
   NaClSrpcChannelInitialize(&command_channel_);
   NaClXMutexCtor(&mu_);
   NaClXCondVarCtor(&cond_);
 }
 
 bool ServiceRuntime::SetupCommandChannel() {
   NaClLog(4, "ServiceRuntime::SetupCommand (this=%p, subprocess=%p)\n",
           static_cast<void*>(this),
           static_cast<void*>(subprocess_.get()));
+  // Set up the bootstrap channel in our subprocess so that we can establish
+  // SRPC.
+  subprocess_->set_channel(bootstrap_channel_);
+
   if (uses_nonsfi_mode_) {
     // In non-SFI mode, no SRPC is used. Just skips and returns success.
     return true;
   }
 
   if (!subprocess_->SetupCommand(&command_channel_)) {
     ErrorInfo error_info;
     error_info.SetReport(PP_NACL_ERROR_SEL_LDR_COMMUNICATION_CMD_CHANNEL,
                          "ServiceRuntime: command channel creation failed");
     ReportLoadError(error_info);
@@ skipping 106 matching lines @@
         PP_NACL_ERROR_SEL_LDR_CREATE_LAUNCHER,
         "ServiceRuntime: failed to create sel_ldr launcher");
     ReportLoadError(error_info);
     pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
     return;
   }
 
   bool enable_dev_interfaces =
       GetNaClInterface()->DevInterfacesEnabled(pp_instance_);
 
-  tmp_subprocess->Start(pp_instance_,
-                        main_service_runtime_,
-                        params.url.c_str(),
-                        &params.file_info,
-                        params.uses_irt,
-                        params.uses_ppapi,
-                        uses_nonsfi_mode_,
-                        enable_dev_interfaces,
-                        params.enable_dyncode_syscalls,
-                        params.enable_exception_handling,
-                        params.enable_crash_throttling,
-                        callback);
+  GetNaClInterface()->LaunchSelLdr(
+      pp_instance_,
+      PP_FromBool(main_service_runtime_),
+      params.url.c_str(),
+      &params.file_info,
+      PP_FromBool(params.uses_irt),
+      PP_FromBool(params.uses_ppapi),
+      PP_FromBool(uses_nonsfi_mode_),
+      PP_FromBool(enable_dev_interfaces),
+      PP_FromBool(params.enable_dyncode_syscalls),
+      PP_FromBool(params.enable_exception_handling),
+      PP_FromBool(params.enable_crash_throttling),
+      &bootstrap_channel_,
+      callback.pp_completion_callback());
   subprocess_.reset(tmp_subprocess.release());
 }
 
 bool ServiceRuntime::WaitForSelLdrStart() {
   // Time to wait on condvar (for browser to create a new sel_ldr process on
   // our behalf). Use 6 seconds to be *fairly* conservative.
   //
   // On surfaway, the CallOnMainThread above may never get scheduled
   // to unblock this condvar, or the IPC reply from the browser to renderer
   // might get canceled/dropped. However, it is currently important to
@@ skipping 201 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin