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

This splits out the Non-SFI case more explicitly when starting a NaCl module to
make the code easier to read. There isn't a whole lot of code in common between
the Non-SFI and SFI cases.

BUG=333950

Review URL: https://codereview.chromium.org/301993003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275464 0039d316-1c4b-4281-b951-d872f2087c98

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_;