Revert of Remove IPC::BrokerableAttachment.

ipc/ipc_channel_nacl.h

 // Copyright (c) 2012 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 IPC_IPC_CHANNEL_NACL_H_
 #define IPC_IPC_CHANNEL_NACL_H_
 
 #include <deque>
 #include <memory>
 #include <string>
@@ skipping 44 matching lines @@
 
   bool CreatePipe(const IPC::ChannelHandle& channel_handle);
   bool ProcessOutgoingMessages();
   void CallOnChannelConnected();
 
   // ChannelReader implementation.
   ReadState ReadData(char* buffer,
                      int buffer_len,
                      int* bytes_read) override;
   bool ShouldDispatchInputMessage(Message* msg) override;
-  bool GetAttachments(Message* msg) override;
+  bool GetNonBrokeredAttachments(Message* msg) override;
   bool DidEmptyInputBuffers() override;
   void HandleInternalMessage(const Message& msg) override;
 
   Mode mode_;
   bool waiting_connect_;
 
   // The pipe used for communication.
   int pipe_;
 
   // The "name" of our pipe.  On Windows this is the global identifier for
@@ skipping 19 matching lines @@
   // MessageContents object is the result of one call to "imc_recvmsg".
   // DidRecvMsg breaks the MessageContents out in to the data and the file
   // descriptors, and puts them on these two queues.
   // TODO(dmichael): There's probably a more efficient way to emulate this with
   //                 a circular buffer or something, so we don't have to do so
   //                 many heap allocations. But it maybe isn't worth
   //                 the trouble given that we probably want to implement 1 and
   //                 2 above in NaCl eventually.
   // When ReadData is called, it pulls the bytes out of this queue in order.
   std::deque<linked_ptr<std::vector<char> > > read_queue_;
-  // Queue of file descriptor attachments extracted from imc_recvmsg messages.
-  std::vector<scoped_refptr<MessageAttachment>> input_attachments_;
+  // Queue of file descriptors extracted from imc_recvmsg messages.
+  // NOTE: The implementation assumes underlying storage here is contiguous, so
+  // don't change to something like std::deque<> without changing the
+  // implementation!
+  std::vector<int> input_fds_;
 
   // This queue is used when a message is sent prior to Connect having been
   // called. Normally after we're connected, the queue is empty.
   std::deque<linked_ptr<Message> > output_queue_;
 
   base::WeakPtrFactory<ChannelNacl> weak_ptr_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelNacl);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_NACL_H_