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

content/child/resource_dispatcher.cc

Index: content/child/resource_dispatcher.cc
diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index c9858a970434c76b9f1625336f2c194e4cc6a42f..aeb1cbebc66081a825d767c136866c04d3bbe4fd 100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -80,9 +80,6 @@
 }
 
 bool ResourceDispatcher::OnMessageReceived(const IPC::Message& message) {
-  // TODO(erikchen): Temporary code to help track http://crbug.com/527588.
-  content::CheckContentsOfDataReceivedMessage(&message);
-
   if (!IsResourceDispatcherMessage(message)) {
     return false;
   }
@@ -222,15 +219,8 @@
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   bool send_ack = true;
   if (request_info && data_length > 0) {
-    // TODO(erikchen): Temporary code to help track http://crbug.com/527588.
-    int buffer_size = request_info->buffer_size;
-
     CHECK(base::SharedMemory::IsHandleValid(request_info->buffer->handle()));
     CHECK_GE(request_info->buffer_size, data_offset + data_length);
-
-    // TODO(erikchen): Temporary code to help track http://crbug.com/527588.
-    base::debug::Alias(request_info);
-    base::debug::Alias(&buffer_size);
 
     // Ensure that the SHM buffer remains valid for the duration of this scope.
     // It is possible for Cancel() to be called before we exit this scope.