diff options
author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 01:33:26 +0000 |
---|---|---|
committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 01:33:26 +0000 |
commit | d73fafb5445e428375e1759a8cacb6660b7f859a (patch) | |
tree | b1971077821c9555b6affd00f6539997efe33a19 /chrome | |
parent | bc7f860169badb3dd7d4aa62b8b2a950d4dcc200 (diff) | |
download | chromium_src-d73fafb5445e428375e1759a8cacb6660b7f859a.zip chromium_src-d73fafb5445e428375e1759a8cacb6660b7f859a.tar.gz chromium_src-d73fafb5445e428375e1759a8cacb6660b7f859a.tar.bz2 |
Set os_error to net::ERR_ABORTED instead of 0 or net::ERR_FAILED when
we set the status of a URLRequestStatus to URLRequestStatus::CANCELED.
R=eroman
BUG=24674
TEST=none
Review URL: http://codereview.chromium.org/269064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/automation/url_request_automation_job.cc | 2 | ||||
-rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host.cc | 2 | ||||
-rw-r--r-- | chrome/common/security_filter_peer.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index 4d6c80e..2e1e659 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -123,7 +123,7 @@ void URLRequestAutomationJob::Start() { void URLRequestAutomationJob::Kill() { if (message_filter_.get()) { message_filter_->Send(new AutomationMsg_RequestEnd(0, tab_, id_, - URLRequestStatus(URLRequestStatus::CANCELED, 0))); + URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED))); } DisconnectFromMessageFilter(); URLRequestJob::Kill(); diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index 597c931..9e7af2f 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -477,7 +477,7 @@ void ResourceDispatcherHost::BeginRequest( receiver_->Send(new ViewMsg_Resource_RequestComplete( route_id, request_id, - URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_FAILED), + URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED), std::string())); } } diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc index a72ed31..e4f20fc 100644 --- a/chrome/common/security_filter_peer.cc +++ b/chrome/common/security_filter_peer.cc @@ -192,7 +192,7 @@ void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status, if (status.status() != URLRequestStatus::SUCCESS || !DataReady()) { // Pretend we failed to load the resource. original_peer_->OnReceivedResponse(response_info_, true); - URLRequestStatus status(URLRequestStatus::CANCELED, 0); + URLRequestStatus status(URLRequestStatus::CANCELED, net::ERR_ABORTED); original_peer_->OnCompletedRequest(status, security_info); return; } |