diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 16:03:25 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 16:03:25 +0000 |
| commit | c1ab5089c52712828018c928bd9faf7115cc328d (patch) | |
| tree | 5be014429e6bfa295f2ecc845b7fc3151f4827bd /content | |
| parent | 2c63d9c5f7c57cbd96e3964023eca3c31546c929 (diff) | |
| download | chromium_src-c1ab5089c52712828018c928bd9faf7115cc328d.zip chromium_src-c1ab5089c52712828018c928bd9faf7115cc328d.tar.gz chromium_src-c1ab5089c52712828018c928bd9faf7115cc328d.tar.bz2 | |
Remove unneeded call to StartCrossSiteTransition.
This prevents running the unload handler and swapping out the previous RVH.
BUG=82667
TEST=SSLUITest.TestHTTPSExpiredCertAndGoBackViaButton
Review URL: http://codereview.chromium.org/7017023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/cross_site_resource_handler.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/renderer_host/cross_site_resource_handler.cc b/content/browser/renderer_host/cross_site_resource_handler.cc index 8138751..1394253 100644 --- a/content/browser/renderer_host/cross_site_resource_handler.cc +++ b/content/browser/renderer_host/cross_site_resource_handler.cc @@ -115,8 +115,10 @@ bool CrossSiteResourceHandler::OnResponseCompleted( const net::URLRequestStatus& status, const std::string& security_info) { if (!in_cross_site_transition_) { - if (has_started_response_) { - // We've already completed the transition, so just pass it through. + if (has_started_response_ || + status.status() != net::URLRequestStatus::FAILED) { + // We've already completed the transition or we're canceling the request, + // so just pass it through. return next_handler_->OnResponseCompleted(request_id, status, security_info); } else { |