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

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index bfb1f3a21bf3d4fe20fd40242e37debfd6673457..890b30a7712e4a7bfb95964314b9722d56ba8441 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -51,8 +51,10 @@
 #include "content/child/websocket_dispatcher.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/in_process_child_thread_params.h"
+#include "content/common/resource_messages.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/attachment_broker_unprivileged.h"
+#include "ipc/ipc_channel.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
@@ -396,6 +398,9 @@ void ChildThreadImpl::Init(const Options& options) {
   if (!IsInBrowserProcess())
     IPC::Logging::GetInstance()->SetIPCSender(this);
 #endif
+  // TODO(erikchen): Temporary code to help track http://crbug.com/527588.
+  IPC::Channel::SetMessageVerifier(
+      &content::CheckContentsOfDataReceivedMessage);
 
   mojo_application_.reset(new MojoApplication(GetIOTaskRunner()));