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

components/nacl/loader/nacl_listener.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_NACL_LOADER_NACL_LISTENER_H_
 #define COMPONENTS_NACL_LOADER_NACL_LISTENER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 10 matching lines @@
 #include "build/build_config.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/loader/nacl_trusted_listener.h"
 #include "ipc/ipc_listener.h"
 
 namespace IPC {
 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 {
  public:
   NaClListener();
   ~NaClListener() override;
   // Listen for a request to launch a NaCl module.
   void Listen();
 
   bool Send(IPC::Message* msg);
@@ skipping 71 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   typedef std::map<
     std::string,  // manifest key
     std::pair<IPC::PlatformFileForTransit,
               base::FilePath> > PrefetchedResourceFilesMap;
   PrefetchedResourceFilesMap prefetched_resource_files_;
 
   bool is_started_;
 
-  std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
-
   DISALLOW_COPY_AND_ASSIGN(NaClListener);
 };
 
 #endif  // COMPONENTS_NACL_LOADER_NACL_LISTENER_H_