Refactoring: Split NaClListener into two delegated classes.

components/nacl/loader/nacl_listener.h

Index: components/nacl/loader/nacl_listener.h
diff --git a/components/nacl/loader/nacl_listener.h b/components/nacl/loader/nacl_listener.h
index 6ca1ec2cb792f9344fc1e604925bb5d18b8a639a..31a0048a0fbff2d54c8119c2720386b564378ae8 100644
--- a/components/nacl/loader/nacl_listener.h
+++ b/components/nacl/loader/nacl_listener.h
@@ -34,9 +34,6 @@ class NaClListener : public IPC::Listener {
 
   bool Send(IPC::Message* msg);
 
-  void set_uses_nonsfi_mode(bool uses_nonsfi_mode) {
-    uses_nonsfi_mode_ = uses_nonsfi_mode;
-  }
 #if defined(OS_LINUX)
   void set_prereserved_sandbox_size(size_t prereserved_sandbox_size) {
     prereserved_sandbox_size_ = prereserved_sandbox_size;
@@ -53,13 +50,6 @@ class NaClListener : public IPC::Listener {
 
   void OnStart(const nacl::NaClStartParams& params);
 
-  // Non-SFI version of OnStart().
-  void StartNonSfi(const nacl::NaClStartParams& params);
-
-  IPC::ChannelHandle CreateTrustedListener(
-      base::MessageLoopProxy* message_loop_proxy,
-      base::WaitableEvent* shutdown_event);
-
   // A channel back to the browser.
   scoped_ptr<IPC::SyncChannel> channel_;
 
@@ -69,7 +59,6 @@ class NaClListener : public IPC::Listener {
   base::WaitableEvent shutdown_event_;
   base::Thread io_thread_;
 
-  bool uses_nonsfi_mode_;
 #if defined(OS_LINUX)
   size_t prereserved_sandbox_size_;
 #endif