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

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"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_attachment_set.h"
 #include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_message_start.h"
 
 namespace IPC {
 namespace internal {
 
 ChannelReader::ChannelReader(Listener* listener) : listener_(listener) {
   memset(input_buf_, 0, sizeof(input_buf_));
 }
 
 ChannelReader::~ChannelReader() {
   DCHECK(blocked_ids_.empty());
@@ skipping 158 matching lines @@
   bool handled = false;
   if (IsInternalMessage(*m)) {
     HandleInternalMessage(*m);
     handled = true;
   }
 #if USE_ATTACHMENT_BROKER
   if (!handled && IsAttachmentBrokerEndpoint() && GetAttachmentBroker()) {
     handled = GetAttachmentBroker()->OnMessageReceived(*m);
   }
 #endif  // USE_ATTACHMENT_BROKER
-
-  // TODO(erikchen): Temporary code to help track http://crbug.com/527588.
-  Channel::MessageVerifier verifier = Channel::GetMessageVerifier();
-  if (verifier)
-    verifier(m);
-
   if (!handled)
     listener_->OnMessageReceived(*m);
   if (m->dispatch_error())
     listener_->OnBadMessageReceived(*m);
 }
 
 ChannelReader::AttachmentIdSet ChannelReader::GetBrokeredAttachments(
     Message* msg) {
   std::set<BrokerableAttachment::AttachmentId> blocked_ids;
 
@@ skipping 42 matching lines @@
 }
 
 void ChannelReader::StopObservingAttachmentBroker() {
 #if USE_ATTACHMENT_BROKER
   GetAttachmentBroker()->RemoveObserver(this);
 #endif  // USE_ATTACHMENT_BROKER
 }
 
 }  // namespace internal
 }  // namespace IPC