NaCl: Split out Non-SFI logic when starting NaCl.

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 f216d922949229fc0e6949df89a334524704930c..6ca1ec2cb792f9344fc1e604925bb5d18b8a639a 100644
--- a/components/nacl/loader/nacl_listener.h
+++ b/components/nacl/loader/nacl_listener.h
@@ -14,6 +14,10 @@
 #include "components/nacl/loader/nacl_trusted_listener.h"
 #include "ipc/ipc_listener.h"
 
+namespace base {
+class MessageLoopProxy;
+}
+
 namespace IPC {
 class SyncChannel;
 class SyncMessageFilter;
@@ -45,9 +49,17 @@ class NaClListener : public IPC::Listener {
 #endif
 
  private:
-  void OnStart(const nacl::NaClStartParams& params);
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
+  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_;