Revert of Remove IPC::BrokerableAttachment.

ipc/ipc_message.cc

 // 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.
 
 #include "ipc/ipc_message.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 148 matching lines @@
   const char* pickle_end = range_start + pickle_size;
 
   info->message_end = pickle_end;
 
   info->pickle_end = pickle_end;
   info->message_found = true;
 }
 
 bool Message::WriteAttachment(
     scoped_refptr<base::Pickle::Attachment> attachment) {
+  bool brokerable;
   size_t index;
   bool success = attachment_set()->AddAttachment(
       make_scoped_refptr(static_cast<MessageAttachment*>(attachment.get())),
-      &index);
+      &index, &brokerable);
   DCHECK(success);
 
   // NOTE: If you add more data to the pickle, make sure to update
   // PickleSizer::AddAttachment.
 
+  // Write the type of descriptor.
+  WriteBool(brokerable);
+
   // Write the index of the descriptor so that we don't have to
   // keep the current descriptor as extra decoding state when deserialising.
   WriteInt(static_cast<int>(index));
 
   return success;
 }
 
 bool Message::ReadAttachment(
     base::PickleIterator* iter,
     scoped_refptr<base::Pickle::Attachment>* attachment) const {
+  bool brokerable;
+  if (!iter->ReadBool(&brokerable))
+    return false;
+
   int index;
   if (!iter->ReadInt(&index))
     return false;
 
   MessageAttachmentSet* attachment_set = attachment_set_.get();
   if (!attachment_set)
     return false;
 
-  *attachment = attachment_set->GetAttachmentAt(index);
+  *attachment = brokerable
+                    ? attachment_set->GetBrokerableAttachmentAt(index)
+                    : attachment_set->GetNonBrokerableAttachmentAt(index);
 
   return nullptr != attachment->get();
 }
 
 bool Message::HasAttachments() const {
   return attachment_set_.get() && !attachment_set_->empty();
 }
 
+bool Message::HasMojoHandles() const {
+  return attachment_set_.get() && attachment_set_->num_mojo_handles() > 0;
+}
+
+bool Message::HasBrokerableAttachments() const {
+  return attachment_set_.get() &&
+         attachment_set_->num_brokerable_attachments() > 0;
+}
+
 }  // namespace IPC