IPC::Message -> base::Pickle

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 222 matching lines @@
   info->message_found = true;
 }
 
 bool Message::AddPlaceholderBrokerableAttachmentWithId(
     BrokerableAttachment::AttachmentId id) {
   scoped_refptr<PlaceholderBrokerableAttachment> attachment(
       new PlaceholderBrokerableAttachment(id));
   return attachment_set()->AddAttachment(attachment);
 }
 
-bool Message::WriteAttachment(scoped_refptr<MessageAttachment> attachment) {
+bool Message::WriteAttachment(
+    scoped_refptr<base::Pickle::Attachment> attachment) {
   bool brokerable;
   size_t index;
-  bool success =
-      attachment_set()->AddAttachment(attachment, &index, &brokerable);
+  bool success = attachment_set()->AddAttachment(
+      make_scoped_refptr(static_cast<MessageAttachment*>(attachment.get())),
+      &index, &brokerable);
   DCHECK(success);
 
   // 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));
 
 #if USE_ATTACHMENT_BROKER
   if (brokerable)
     header()->num_brokered_attachments++;
 #endif
 
   return success;
 }
 
 bool Message::ReadAttachment(
     base::PickleIterator* iter,
-    scoped_refptr<MessageAttachment>* attachment) const {
+    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)
@@ skipping 13 matching lines @@
 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