Chromium Code Reviews| Index: content/browser/renderer_host/resource_dispatcher_host.cc |
| diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc |
| index e6f4191c52ae924f38f2a5db6046a1c3003dcbbb..e5a55ad656c93988512165f5ef8adf77a561fda6 100644 |
| --- a/content/browser/renderer_host/resource_dispatcher_host.cc |
| +++ b/content/browser/renderer_host/resource_dispatcher_host.cc |
| @@ -144,6 +144,29 @@ void AbortRequestBeforeItStarts(ResourceMessageFilter* filter, |
| } |
| } |
| +// Aborts a request before an URLRequest has actually been created. |
| +void CancelRequestBeforeItStarts(ResourceMessageFilter* filter, |
|
gavinp
2011/06/15 15:31:23
Instead of writing this function, add a bool or en
|
| + IPC::Message* sync_result, |
| + int route_id, |
| + int request_id) { |
| + net::URLRequestStatus status(net::URLRequestStatus::CANCELED, |
| + net::ERR_ABORTED); |
| + if (sync_result) { |
| + SyncLoadResult result; |
| + result.status = status; |
| + ResourceHostMsg_SyncLoad::WriteReplyParams(sync_result, result); |
| + filter->Send(sync_result); |
| + } else { |
| + // Tell the renderer that this request was disallowed. |
| + filter->Send(new ResourceMsg_RequestComplete( |
| + route_id, |
| + request_id, |
| + status, |
| + std::string(), // No security info needed, connection was not |
| + base::Time())); // established. |
| + } |
| +} |
| + |
| GURL MaybeStripReferrer(const GURL& possible_referrer) { |
| if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoReferrers)) |
| return GURL(); |
| @@ -397,7 +420,7 @@ void ResourceDispatcherHost::BeginRequest( |
| request_data, |
| resource_context, |
| referrer)) { |
| - AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id); |
| + CancelRequestBeforeItStarts(filter_, sync_result, route_id, request_id); |
| return; |
| } |