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

content/child/resource_dispatcher.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/child/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 62 matching lines @@
       delegate_(NULL),
       io_timestamp_(base::TimeTicks()),
       main_thread_task_runner_(main_thread_task_runner),
       weak_factory_(this) {
 }
 
 ResourceDispatcher::~ResourceDispatcher() {
 }
 
 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;
   }
 
   int request_id;
 
   base::PickleIterator iter(message);
   if (!iter.ReadInt(&request_id)) {
     NOTREACHED() << "malformed resource message";
     return true;
@@ skipping 119 matching lines @@
 
 void ResourceDispatcher::OnReceivedData(int request_id,
                                         int data_offset,
                                         int data_length,
                                         int encoded_data_length) {
   TRACE_EVENT0("loader", "ResourceDispatcher::OnReceivedData");
   DCHECK_GT(data_length, 0);
   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.
     // SharedMemoryReceivedDataFactory stores the SHM buffer inside it.
     scoped_refptr<SharedMemoryReceivedDataFactory> factory(
         request_info->received_data_factory);
 
     base::TimeTicks time_start = base::TimeTicks::Now();
 
     const char* data_start = static_cast<char*>(request_info->buffer->memory());
     CHECK(data_start);
@@ skipping 553 matching lines @@
       extra_data->transferred_request_request_id();
   request->service_worker_provider_id =
       extra_data->service_worker_provider_id();
   request->request_body = request_body;
   if (frame_origin)
     *frame_origin = extra_data->frame_origin();
   return request.Pass();
 }
 
 }  // namespace content