NaCl cleanup: Stop connecting to the SRPC trusted command channel

components/nacl/renderer/plugin/service_runtime.cc

Index: components/nacl/renderer/plugin/service_runtime.cc
diff --git a/components/nacl/renderer/plugin/service_runtime.cc b/components/nacl/renderer/plugin/service_runtime.cc
index d60fa8fa45a84138a5028542eb61502f1ee9bd58..acf7aa224086ae6e67f214dcda116ea036c21461 100644
--- a/components/nacl/renderer/plugin/service_runtime.cc
+++ b/components/nacl/renderer/plugin/service_runtime.cc
@@ -42,7 +42,6 @@ ServiceRuntime::ServiceRuntime(Plugin* plugin,
       main_service_runtime_(main_service_runtime),
       uses_nonsfi_mode_(uses_nonsfi_mode),
       bootstrap_channel_(NACL_INVALID_HANDLE) {
-  NaClSrpcChannelInitialize(&command_channel_);
 }
 
 bool ServiceRuntime::SetupCommandChannel() {
@@ -58,14 +57,8 @@ bool ServiceRuntime::SetupCommandChannel() {
     return true;
   }
 
-  if (!subprocess_->SetupCommand(&command_channel_)) {
-    ErrorInfo error_info;
-    error_info.SetReport(PP_NACL_ERROR_SEL_LDR_COMMUNICATION_CMD_CHANNEL,

[jvoung (off chromium), 2015/06/09 15:43:44]

If want to keep this UMA stat (it's about 0.01%), you could place it in the !ok
part of StartNexe.

[Mark Seaborn, 2015/06/10 00:31:04]

Oh, good point!  I was deleting code without really thinking about it.

I've reinstated the error reporting.  I've split it to report two more-specific
error messages in case that helps debugging.

Please take a look.

-                         "ServiceRuntime: command channel creation failed");
-    ReportLoadError(error_info);
-    return false;
-  }
-  return true;
+  return subprocess_->ConnectBootstrapSocket() &&
+         subprocess_->RetrieveSockAddr();
 }
 
 void ServiceRuntime::StartSelLdr(const SelLdrStartParams& params,
@@ -138,8 +131,6 @@ void ServiceRuntime::Shutdown() {
 
   // Note that this does waitpid() to get rid of any zombie subprocess.
   subprocess_.reset(NULL);
-
-  NaClSrpcDtor(&command_channel_);
 }
 
 ServiceRuntime::~ServiceRuntime() {