NaCl cleanup: Stop connecting to the SRPC trusted command channel

components/nacl/renderer/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 "components/nacl/renderer/plugin/service_runtime.h"
 
@@ skipping 24 matching lines @@
 
 ServiceRuntime::ServiceRuntime(Plugin* plugin,
                                PP_Instance pp_instance,
                                bool main_service_runtime,
                                bool uses_nonsfi_mode)
     : plugin_(plugin),
       pp_instance_(pp_instance),
       main_service_runtime_(main_service_runtime),
       uses_nonsfi_mode_(uses_nonsfi_mode),
       bootstrap_channel_(NACL_INVALID_HANDLE) {
-  NaClSrpcChannelInitialize(&command_channel_);
 }
 
 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_)) {
+  if (!subprocess_->ConnectBootstrapSocket()) {
     ErrorInfo error_info;
     error_info.SetReport(PP_NACL_ERROR_SEL_LDR_COMMUNICATION_CMD_CHANNEL,
-                         "ServiceRuntime: command channel creation failed");
+                         "ServiceRuntime: ConnectBootstrapSocket() failed");
     ReportLoadError(error_info);
     return false;
   }
+  if (!subprocess_->RetrieveSockAddr()) {
+    ErrorInfo error_info;
+    error_info.SetReport(PP_NACL_ERROR_SEL_LDR_COMMUNICATION_CMD_CHANNEL,
+                         "ServiceRuntime: RetrieveSockAddr() failed");
+    ReportLoadError(error_info);
+    return false;
+  }
   return true;
 }
 
 void ServiceRuntime::StartSelLdr(const SelLdrStartParams& params,
                                  pp::CompletionCallback callback) {
   NaClLog(4, "ServiceRuntime::Start\n");
 
   nacl::scoped_ptr<SelLdrLauncherChrome>
       tmp_subprocess(new SelLdrLauncherChrome());
   if (NULL == tmp_subprocess.get()) {
@@ skipping 53 matching lines @@
 void ServiceRuntime::Shutdown() {
   // Abandon callbacks, tell service threads to quit if they were
   // blocked waiting for main thread operations to finish.  Note that
   // some callbacks must still await their completion event, e.g.,
   // CallOnMainThread must still wait for the time out, or I/O events
   // must finish, so resources associated with pending events cannot
   // be deallocated.
 
   // Note that this does waitpid() to get rid of any zombie subprocess.
   subprocess_.reset(NULL);
-
-  NaClSrpcDtor(&command_channel_);
 }
 
 ServiceRuntime::~ServiceRuntime() {
   NaClLog(4, "ServiceRuntime::~ServiceRuntime (this=%p)\n",
           static_cast<void*>(this));
   // We do this just in case Shutdown() was not called.
   subprocess_.reset(NULL);
 }
 
 }  // namespace plugin