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

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 533681cd8e0f2d4dd2061ec9ab7411799550bf22..2b0fdb6f269a07ebbb528ea5df89dceefb8110f8 100644
--- a/components/nacl/loader/nacl_listener.h
+++ b/components/nacl/loader/nacl_listener.h
@@ -28,12 +28,6 @@ class SyncChannel;
 class SyncMessageFilter;
 }
 
-namespace mojo {
-namespace edk {
-class ScopedIPCSupport;
-}  // namespace edk
-}  // namespace mojo
-
 // The NaClListener is an IPC channel listener that waits for a
 // request to start a NaCl module.
 class NaClListener : public IPC::Listener {
@@ -125,8 +119,6 @@ class NaClListener : public IPC::Listener {
 
   bool is_started_;
 
-  std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
-
   DISALLOW_COPY_AND_ASSIGN(NaClListener);
 };