ipc: Make a new class PlaceholderBrokerableAttachment.

ipc/ipc_channel_reader.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_channel_reader.h"
 
 #include <algorithm>
 
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
@@ skipping 79 matching lines @@
   }
 
   // Dispatch all complete messages in the data buffer.
   while (p < end) {
     Message::NextMessageInfo info;
     Message::FindNext(p, end, &info);
     if (info.message_found) {
       int pickle_len = static_cast<int>(info.pickle_end - p);
       Message translated_message(p, pickle_len);
 
-      // TODO(erikchen): Make attachments for info.attachment_ids.
-      // http://crbug.com/493414.
+      for (const auto& id : info.attachment_ids)
+        translated_message.AddPlaceholderBrokerableAttachmentWithId(id);
 
       if (!GetNonBrokeredAttachments(&translated_message))
         return false;
 
       // If there are no queued messages, attempt to immediately dispatch the
       // newly translated message.
       if (queued_messages_.empty()) {
         DCHECK(blocked_ids_.empty());
         AttachmentIdSet blocked_ids =
             GetBrokeredAttachments(&translated_message);
@@ skipping 82 matching lines @@
   if (m->dispatch_error())
     listener_->OnBadMessageReceived(*m);
 }
 
 ChannelReader::AttachmentIdSet ChannelReader::GetBrokeredAttachments(
     Message* msg) {
   std::set<BrokerableAttachment::AttachmentId> blocked_ids;
 
 #if USE_ATTACHMENT_BROKER
   MessageAttachmentSet* set = msg->attachment_set();
-  for (const scoped_refptr<BrokerableAttachment>& attachment :
-       set->GetBrokerableAttachmentsForUpdating()) {
+  std::vector<const BrokerableAttachment*> brokerable_attachments_copy =
+      set->PeekBrokerableAttachments();
+  for (const BrokerableAttachment* attachment : brokerable_attachments_copy) {
     if (attachment->NeedsBrokering()) {
       AttachmentBroker* broker = GetAttachmentBroker();
       scoped_refptr<BrokerableAttachment> brokered_attachment;
       bool result = broker->GetAttachmentWithId(attachment->GetIdentifier(),
                                                 &brokered_attachment);
       if (!result) {
         blocked_ids.insert(attachment->GetIdentifier());
         continue;
       }
 
-      attachment->PopulateWithAttachment(brokered_attachment.get());
+      set->ReplacePlaceholderWithAttachment(brokered_attachment);
     }
   }
 #endif  // USE_ATTACHMENT_BROKER
 
   return blocked_ids;
 }
 
 void ChannelReader::ReceivedBrokerableAttachmentWithId(
     const BrokerableAttachment::AttachmentId& id) {
   if (blocked_ids_.empty())
@@ skipping 16 matching lines @@
 }
 
 void ChannelReader::StopObservingAttachmentBroker() {
 #if USE_ATTACHMENT_BROKER
   GetAttachmentBroker()->RemoveObserver(this);
 #endif  // USE_ATTACHMENT_BROKER
 }
 
 }  // namespace internal
 }  // namespace IPC