Revert of IPC: Add attachment brokering support to the message header.

ipc/ipc_message_attachment_set.cc

 // Copyright (c) 2011 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_attachment_set.h"
 
 #include <algorithm>
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "ipc/brokerable_attachment.h"
@@ skipping 125 matching lines @@
   std::vector<const BrokerableAttachment*> output;
   for (const scoped_refptr<MessageAttachment>& attachment : attachments_) {
     if (attachment->GetType() ==
         MessageAttachment::TYPE_BROKERABLE_ATTACHMENT) {
       output.push_back(static_cast<BrokerableAttachment*>(attachment.get()));
     }
   }
   return output;
 }
 
-void MessageAttachmentSet::ReplacePlaceholderWithAttachment(
-    const scoped_refptr<BrokerableAttachment>& attachment) {
-  for (auto it = attachments_.begin(); it != attachments_.end(); ++it) {
-    if ((*it)->GetType() != MessageAttachment::TYPE_BROKERABLE_ATTACHMENT)
-      continue;
-    BrokerableAttachment* brokerable_attachment =
-        static_cast<BrokerableAttachment*>(it->get());
-
-    if (brokerable_attachment->GetBrokerableType() ==
-            BrokerableAttachment::PLACEHOLDER &&
-        brokerable_attachment->GetIdentifier() == attachment->GetIdentifier()) {
-      *it = attachment;
-      return;
+std::vector<scoped_refptr<BrokerableAttachment>>
+MessageAttachmentSet::GetBrokerableAttachmentsForUpdating() {
+  std::vector<scoped_refptr<BrokerableAttachment>> output;
+  for (const scoped_refptr<MessageAttachment>& attachment : attachments_) {
+    if (attachment->GetType() ==
+        MessageAttachment::TYPE_BROKERABLE_ATTACHMENT) {
+      output.push_back(scoped_refptr<BrokerableAttachment>(
+          static_cast<BrokerableAttachment*>(attachment.get())));
     }
   }
-
-  // This function should only be called if there is a placeholder ready to be
-  // replaced.
-  NOTREACHED();
+  return output;
 }
 
 #if defined(OS_POSIX)
 
 void MessageAttachmentSet::PeekDescriptors(base::PlatformFile* buffer) const {
   for (size_t i = 0; i != attachments_.size(); ++i)
     buffer[i] = internal::GetPlatformFile(attachments_[i]);
 }
 
 bool MessageAttachmentSet::ContainsDirectoryDescriptor() const {
@@ skipping 29 matching lines @@
   for (unsigned i = 0; i < count; ++i)
     AddAttachment(
         new internal::PlatformFileAttachment(base::ScopedFD(buffer[i])));
 }
 
 #endif  // OS_POSIX
 
 }  // namespace IPC