Revert of Remove IPC::BrokerableAttachment.

base/pickle.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 "base/pickle.h"
 
 #include <stdlib.h>
 
 #include <algorithm>  // for max()
 #include <limits>
@@ skipping 215 matching lines @@
   AddInt();
   AddBytes(length);
 }
 
 void PickleSizer::AddBytes(int length) {
   payload_size_ += bits::Align(length, sizeof(uint32_t));
 }
 
 void PickleSizer::AddAttachment() {
   // From IPC::Message::WriteAttachment
+  AddBool();
   AddInt();
 }
 
 template <size_t length> void PickleSizer::AddBytesStatic() {
   DCHECK_LE(length, static_cast<size_t>(std::numeric_limits<int>::max()));
   AddBytes(length);
 }
 
 template void PickleSizer::AddBytesStatic<2>();
 template void PickleSizer::AddBytesStatic<4>();
@@ skipping 227 matching lines @@
 
 inline void Pickle::WriteBytesCommon(const void* data, size_t length) {
   DCHECK_NE(kCapacityReadOnly, capacity_after_header_)
       << "oops: pickle is readonly";
   MSAN_CHECK_MEM_IS_INITIALIZED(data, length);
   void* write = ClaimUninitializedBytesInternal(length);
   memcpy(write, data, length);
 }
 
 }  // namespace base