Remove a couple of unused methods from sel_ldr_launcher_base.

src/trusted/nonnacl_util/sel_ldr_launcher.h

 /* -*- c++ -*- */
 /*
  * 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.
  */
 
 
 // Utility class for launching sel_ldr.
 
@@ skipping 25 matching lines @@
  */
 class SelLdrLocator {
  public:
   // Returns a directory with sel_ldr.
   virtual void GetDirectory(char* buffer, size_t len) = 0;
 
   SelLdrLocator() {}
 
   virtual ~SelLdrLocator() {}
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(SelLdrLocator);
 };
 
 /*
  * Default implementation of SelLdrLocator which tries to
  * locate a browser plugin. Default constructor of SelLdrLauncher use it.
  */
 class PluginSelLdrLocator : public SelLdrLocator {
  public:
   // We have different implementations for all platforms.
   virtual void GetDirectory(char* buffer, size_t len);
 
   PluginSelLdrLocator() {}
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PluginSelLdrLocator);
 };
 
 /*
  * This class encapsulates the process of launching an instance of sel_ldr
  * to communicate with the NaCl plugin over an IMC channel.
  *
  * The sel_ldr process can be forked directly using a command line of args
  * or by sending a message to the (Chrome) browser process.
  */
 class SelLdrLauncherBase {
  public:
   SelLdrLauncherBase();
   virtual ~SelLdrLauncherBase();
 
   /////////////////////////////////////////////////////////////////////////////
   // Browser start-up: (used by the plugin inside or outside of Chrome build.)
   /////////////////////////////////////////////////////////////////////////////
 
   virtual bool Start(const char* url) = 0;
 
   /////////////////////////////////////////////////////////////////////////////
   // After starting the sel_ldr process.
   /////////////////////////////////////////////////////////////////////////////
 
-  // Connects bootstrap socket.
-  bool ConnectBootstrapSocket();
-
-  // Retrieves the socket address.
-  bool RetrieveSockAddr();
-
   // Sets up the command channel |command|.
   bool SetupCommand(NaClSrpcChannel* command);
 
   // Load |nexe| over the command channel |command|.
   bool LoadModule(NaClSrpcChannel* command, DescWrapper* nexe);
 
-  // Sets up the command channel |command| and sends the SRPC to load |nexe|.
-  bool SetupCommandAndLoad(NaClSrpcChannel* command, DescWrapper* nexe);
-
   // Sends the SRPC to start the nexe over |command|.
   bool StartModule(NaClSrpcChannel* command);
 
   // Sets up the SRPC channel |out_app_chan|.
   bool SetupAppChannel(NaClSrpcChannel* out_app_chan);
 
-  // Sends the SRPC to start the nexe over |command| and sets up the application
-  // SRPC chanel |out_app_chan|.
-  bool StartModuleAndSetupAppChannel(NaClSrpcChannel* command,
-                                     NaClSrpcChannel* out_app_chan);
-
-  // Returns the socket address used to connect to the sel_ldr.
-  DescWrapper* secure_socket_addr() const { return secure_socket_addr_.get(); }
-
   // Returns the socket address used to connect to the module.
   DescWrapper* socket_addr() const { return socket_addr_.get(); }
 
-  // Wraps a raw NaClDesc descriptor.  If NULL is returned, caller retains
-  // ownership of the reference.
-  DescWrapper* Wrap(NaClDesc* raw_desc);
-
-  // As above, but raw_desc is Unref'd on failure.
-  DescWrapper* WrapCleanup(NaClDesc* raw_desc);
-
  protected:
   NaClHandle channel_;
 
  private:
+  // Connects bootstrap socket.
+  bool ConnectBootstrapSocket();
+
+  // Retrieves the socket address.
+  bool RetrieveSockAddr();
+
   // lifetime of bootstrap_socket_ must be at least that of factory_
   scoped_ptr<DescWrapperFactory> factory_;
   scoped_ptr<DescWrapper> bootstrap_socket_;
   // The socket address returned from sel_ldr for connects.
   scoped_ptr<DescWrapper> secure_socket_addr_;
   scoped_ptr<DescWrapper> socket_addr_;
 };
 
 class SelLdrLauncherStandalone : public SelLdrLauncherBase {
  public:
@@ skipping 70 matching lines @@
   std::vector<nacl::string> application_argv_;
 
   std::vector<NaClHandle> close_after_launch_;
 
   scoped_ptr<SelLdrLocator> sel_ldr_locator_;
 };
 
 }  // namespace nacl
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_NONNACL_UTIL_SEL_LDR_LAUNCHER_H_