Index: content/browser/loader/async_resource_handler.cc |
=================================================================== |
--- content/browser/loader/async_resource_handler.cc (revision 221543) |
+++ content/browser/loader/async_resource_handler.cc (working copy) |
@@ -78,12 +78,10 @@ |
AsyncResourceHandler::AsyncResourceHandler( |
ResourceMessageFilter* filter, |
- int routing_id, |
net::URLRequest* request, |
ResourceDispatcherHostImpl* rdh) |
: ResourceMessageDelegate(request), |
filter_(filter), |
- routing_id_(routing_id), |
request_(request), |
rdh_(rdh), |
pending_data_count_(0), |
@@ -139,8 +137,8 @@ |
bool AsyncResourceHandler::OnUploadProgress(int request_id, |
uint64 position, |
uint64 size) { |
- return filter_->Send(new ResourceMsg_UploadProgress(routing_id_, request_id, |
- position, size)); |
+ return filter_->Send(new ResourceMsg_UploadProgress(request_id, position, |
+ size)); |
} |
bool AsyncResourceHandler::OnRequestRedirected(int request_id, |
@@ -159,7 +157,7 @@ |
response->head.request_start = request_->creation_time(); |
response->head.response_start = TimeTicks::Now(); |
return filter_->Send(new ResourceMsg_ReceivedRedirect( |
- routing_id_, request_id, new_url, response->head)); |
+ request_id, new_url, response->head)); |
} |
bool AsyncResourceHandler::OnResponseStarted(int request_id, |
@@ -194,16 +192,14 @@ |
response->head.request_start = request_->creation_time(); |
response->head.response_start = TimeTicks::Now(); |
- filter_->Send(new ResourceMsg_ReceivedResponse( |
- routing_id_, request_id, response->head)); |
+ filter_->Send(new ResourceMsg_ReceivedResponse(request_id, response->head)); |
sent_received_response_msg_ = true; |
if (request_->response_info().metadata.get()) { |
std::vector<char> copy(request_->response_info().metadata->data(), |
request_->response_info().metadata->data() + |
request_->response_info().metadata->size()); |
- filter_->Send(new ResourceMsg_ReceivedCachedMetadata( |
- routing_id_, request_id, copy)); |
+ filter_->Send(new ResourceMsg_ReceivedCachedMetadata(request_id, copy)); |
} |
return true; |
@@ -254,9 +250,8 @@ |
int size; |
if (!buffer_->ShareToProcess(filter_->PeerHandle(), &handle, &size)) |
return false; |
- filter_->Send( |
- new ResourceMsg_SetDataBuffer(routing_id_, request_id, handle, size, |
- filter_->peer_pid())); |
+ filter_->Send(new ResourceMsg_SetDataBuffer( |
+ request_id, handle, size, filter_->peer_pid())); |
sent_first_data_msg_ = true; |
} |
@@ -264,9 +259,8 @@ |
int encoded_data_length = |
DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_); |
- filter_->Send( |
- new ResourceMsg_DataReceived(routing_id_, request_id, data_offset, |
- bytes_read, encoded_data_length)); |
+ filter_->Send(new ResourceMsg_DataReceived( |
+ request_id, data_offset, bytes_read, encoded_data_length)); |
++pending_data_count_; |
UMA_HISTOGRAM_CUSTOM_COUNTS( |
"Net.AsyncResourceHandler_PendingDataCount", |
@@ -288,7 +282,7 @@ |
DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_); |
filter_->Send(new ResourceMsg_DataDownloaded( |
- routing_id_, request_id, bytes_downloaded, encoded_data_length)); |
+ request_id, bytes_downloaded, encoded_data_length)); |
} |
bool AsyncResourceHandler::OnResponseCompleted( |
@@ -331,8 +325,7 @@ |
error_code = net::ERR_FAILED; |
} |
- filter_->Send(new ResourceMsg_RequestComplete(routing_id_, |
- request_id, |
+ filter_->Send(new ResourceMsg_RequestComplete(request_id, |
error_code, |
was_ignored_by_handler, |
security_info, |