Revert of Reland #1 "ipc: Add a new field num_brokered_attachments to the message header."

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 "base/atomic_sequence_num.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ipc/ipc_message_attachment.h"
@@ skipping 28 matching lines @@
 namespace IPC {
 
 //------------------------------------------------------------------------------
 
 Message::~Message() {
 }
 
 Message::Message() : base::Pickle(sizeof(Header)) {
   header()->routing = header()->type = 0;
   header()->flags = GetRefNumUpper24();
-#if USE_ATTACHMENT_BROKER
-  header()->num_brokered_attachments = 0;
-#endif
 #if defined(OS_POSIX)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
   Init();
 }
 
 Message::Message(int32 routing_id, uint32 type, PriorityValue priority)
     : base::Pickle(sizeof(Header)) {
   header()->routing = routing_id;
   header()->type = type;
   DCHECK((priority & 0xffffff00) == 0);
   header()->flags = priority | GetRefNumUpper24();
-#if USE_ATTACHMENT_BROKER
-  header()->num_brokered_attachments = 0;
-#endif
 #if defined(OS_POSIX)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
   Init();
 }
 
 Message::Message(const char* data, int data_len)
     : base::Pickle(data, data_len) {
   Init();
@@ skipping 52 matching lines @@
 
 void Message::set_received_time(int64 time) const {
   received_time_ = time;
 }
 #endif
 
 bool Message::WriteAttachment(scoped_refptr<MessageAttachment> attachment) {
   // We write the index of the descriptor so that we don't have to
   // keep the current descriptor as extra decoding state when deserialising.
   WriteInt(attachment_set()->size());
-
-#if USE_ATTACHMENT_BROKER
-  if (attachment->GetType() == MessageAttachment::TYPE_BROKERABLE_ATTACHMENT)
-    header()->num_brokered_attachments += 1;
-#endif
-
   return attachment_set()->AddAttachment(attachment);
 }
 
 bool Message::ReadAttachment(
     base::PickleIterator* iter,
     scoped_refptr<MessageAttachment>* attachment) const {
   int descriptor_index;
   if (!iter->ReadInt(&descriptor_index))
     return false;
 
@@ skipping 12 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