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

ipc/ipc_channel_reader.cc

Index: ipc/ipc_channel_reader.cc
diff --git a/ipc/ipc_channel_reader.cc b/ipc/ipc_channel_reader.cc
index 031417b03cedc87ea3b601f3deba7efff1e04400..8ec66944617728033520cfa2a11c14faafe8347d 100644
--- a/ipc/ipc_channel_reader.cc
+++ b/ipc/ipc_channel_reader.cc
@@ -11,6 +11,7 @@
 #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 {
@@ -189,6 +190,12 @@ void ChannelReader::DispatchMessage(Message* m) {
     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())