Pepper: SelLdrLauncherChrome cleanup.

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

 /* -*- c++ -*- */
 /*
  * 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.
  */
 
 // A class containing information regarding a socket connection to a
 // service runtime instance.
 
@@ skipping 18 matching lines @@
 struct NaClFileInfo;
 
 namespace nacl {
 class DescWrapper;
 }  // namespace
 
 namespace plugin {
 
 class ErrorInfo;
 class Plugin;
+class SelLdrLauncherChrome;
 class SrpcClient;
 class ServiceRuntime;
 
 // Struct of params used by StartSelLdr.  Use a struct so that callback
 // creation templates aren't overwhelmed with too many parameters.
 struct SelLdrStartParams {
   SelLdrStartParams(const nacl::string& url,
                     const PP_NaClFileInfo& file_info,
                     bool uses_irt,
                     bool uses_ppapi,
@@ skipping 163 matching lines @@
   void ReapLogs();
 
   void ReportLoadError(const ErrorInfo& error_info);
 
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
   PP_Instance pp_instance_;
   bool main_service_runtime_;
   bool uses_nonsfi_mode_;
   nacl::ReverseService* reverse_service_;
-  nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_;
+  nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_;
 
   nacl::WeakRefAnchor* anchor_;
 
   PluginReverseInterface* rev_interface_;
 
   // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.
   NaClMutex mu_;
   NaClCondVar cond_;
   bool start_sel_ldr_done_;
   bool start_nexe_done_;
   bool nexe_started_ok_;
+
+  NaClHandle bootstrap_channel_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_