Change the NaCl loader and broker processes to use the ServiceManager.

components/nacl/loader/nonsfi/nonsfi_listener.h

Index: components/nacl/loader/nonsfi/nonsfi_listener.h
diff --git a/components/nacl/loader/nonsfi/nonsfi_listener.h b/components/nacl/loader/nonsfi/nonsfi_listener.h
index 2df900e97ab47d293b141a5cb36bcf8cbd88614c..2e5f085b7de0f9f5fadf02e64ae147ddd9102f1a 100644
--- a/components/nacl/loader/nonsfi/nonsfi_listener.h
+++ b/components/nacl/loader/nonsfi/nonsfi_listener.h
@@ -20,12 +20,6 @@ class Message;
 class SyncChannel;
 }  // namespace IPC
 
-namespace mojo {
-namespace edk {
-class ScopedIPCSupport;
-}  // namespace edk
-}  // namespace mojo
-
 class NaClTrustedListener;
 
 namespace nacl {
@@ -52,7 +46,6 @@ class NonSfiListener : public IPC::Listener {
   base::WaitableEvent shutdown_event_;
   std::unique_ptr<IPC::SyncChannel> channel_;
   scoped_refptr<NaClTrustedListener> trusted_listener_;
-  std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
 
   std::unique_ptr<std::map<std::string, int>> key_fd_map_;