Index: content/browser/loader/async_resource_handler.cc |
diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc |
index 69df993843453e1105111ba1193f1c8dc8fe3edd..27661a760638429f7451e9fe65c91d9fe36048da 100644 |
--- a/content/browser/loader/async_resource_handler.cc |
+++ b/content/browser/loader/async_resource_handler.cc |
@@ -217,6 +217,7 @@ AsyncResourceHandler::AsyncResourceHandler( |
waiting_for_upload_progress_ack_(false), |
reported_transfer_size_(0), |
reported_encoded_body_length_(0) { |
+ DCHECK(GetRequestInfo()->requester_info().IsRenderer()); |
InitializeResourceBufferConstants(); |
} |
@@ -300,8 +301,8 @@ bool AsyncResourceHandler::OnRequestRedirected( |
const net::RedirectInfo& redirect_info, |
ResourceResponse* response, |
bool* defer) { |
- const ResourceRequestInfoImpl* info = GetRequestInfo(); |
- if (!info->filter()) |
+ ResourceMessageFilter* filter = GetFilter(); |
+ if (!filter) |
return false; |
*defer = did_defer_ = true; |
@@ -316,7 +317,7 @@ bool AsyncResourceHandler::OnRequestRedirected( |
// cookies? The only case where it can change is top-level navigation requests |
// and hopefully those will eventually all be owned by the browser. It's |
// possible this is still needed while renderer-owned ones exist. |
- return info->filter()->Send(new ResourceMsg_ReceivedRedirect( |
+ return filter->Send(new ResourceMsg_ReceivedRedirect( |
GetRequestID(), redirect_info, response->head)); |
} |
@@ -332,7 +333,8 @@ bool AsyncResourceHandler::OnResponseStarted(ResourceResponse* response, |
progress_timer_.Stop(); |
const ResourceRequestInfoImpl* info = GetRequestInfo(); |
- if (!info->filter()) |
+ ResourceMessageFilter* filter = GetFilter(); |
+ if (!filter) |
return false; |
// We want to send a final upload progress message prior to sending the |
@@ -361,16 +363,15 @@ bool AsyncResourceHandler::OnResponseStarted(ResourceResponse* response, |
response->head.request_start = request()->creation_time(); |
response->head.response_start = TimeTicks::Now(); |
- info->filter()->Send(new ResourceMsg_ReceivedResponse(GetRequestID(), |
- response->head)); |
+ filter->Send( |
+ new ResourceMsg_ReceivedResponse(GetRequestID(), 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()); |
- info->filter()->Send(new ResourceMsg_ReceivedCachedMetadata(GetRequestID(), |
- copy)); |
+ filter->Send(new ResourceMsg_ReceivedCachedMetadata(GetRequestID(), copy)); |
} |
inlining_helper_->OnResponseReceived(*response); |
@@ -481,7 +482,8 @@ void AsyncResourceHandler::OnResponseCompleted( |
const net::URLRequestStatus& status, |
bool* defer) { |
const ResourceRequestInfoImpl* info = GetRequestInfo(); |
- if (!info->filter()) |
+ ResourceMessageFilter* filter = GetFilter(); |
+ if (!filter) |
return; |
// If we crash here, figure out what URL the renderer was requesting. |
@@ -514,7 +516,7 @@ void AsyncResourceHandler::OnResponseCompleted( |
request_complete_data.completion_time = TimeTicks::Now(); |
request_complete_data.encoded_data_length = |
request()->GetTotalReceivedBytes(); |
- info->filter()->Send( |
+ filter->Send( |
new ResourceMsg_RequestComplete(GetRequestID(), request_complete_data)); |
if (status.is_success()) |