Revert of Clean up public interface of AttachmentBrokerUnprivileged.

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>
 
 #include <map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #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 AttachmentBrokerUnprivileged;
 class SyncChannel;
 class SyncMessageFilter;
 }
 
 // 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;
@@ skipping 37 matching lines @@
                               base::FilePath)> OpenResourceReplyCallback;
 
   bool OnOpenResource(const IPC::Message& msg,
                       const std::string& key,
                       OpenResourceReplyCallback cb);
 
   void OnAddPrefetchedResource(
       const nacl::NaClResourcePrefetchResult& prefetched_resource_file);
   void OnStart(const nacl::NaClStartParams& params);
 
+  scoped_ptr<IPC::AttachmentBrokerUnprivileged> attachment_broker_;
+
   // A channel back to the browser.
   scoped_ptr<IPC::SyncChannel> channel_;
 
   // A filter that allows other threads to use the channel.
   scoped_refptr<IPC::SyncMessageFilter> filter_;
 
   base::WaitableEvent shutdown_event_;
   base::Thread io_thread_;
 
 #if defined(OS_LINUX)
@@ skipping 22 matching lines @@
     std::pair<IPC::PlatformFileForTransit,
               base::FilePath> > PrefetchedResourceFilesMap;
   PrefetchedResourceFilesMap prefetched_resource_files_;
 
   bool is_started_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClListener);
 };
 
 #endif  // COMPONENTS_NACL_LOADER_NACL_LISTENER_H_