| Index: content/browser/frame_host/navigation_request.cc
|
| diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
|
| index ab3135bbc74f9df44173788376c21f34941c9e05..b15bdcbac914e3a6492b98776b99c918d2df6b5a 100644
|
| --- a/content/browser/frame_host/navigation_request.cc
|
| +++ b/content/browser/frame_host/navigation_request.cc
|
| @@ -675,7 +675,8 @@ void NavigationRequest::OnStartChecksComplete(
|
| return;
|
| }
|
|
|
| - if (result == NavigationThrottle::BLOCK_REQUEST) {
|
| + if (result == NavigationThrottle::BLOCK_REQUEST ||
|
| + result == NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE) {
|
| OnRequestFailed(false, net::ERR_BLOCKED_BY_CLIENT);
|
|
|
| // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
|
| @@ -770,7 +771,7 @@ void NavigationRequest::OnRedirectChecksComplete(
|
| // Abort the request if needed. This will destroy the NavigationRequest.
|
| if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
|
| result == NavigationThrottle::CANCEL) {
|
| - // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
|
| + // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE if needed.
|
| OnRequestFailed(false, net::ERR_ABORTED);
|
|
|
| // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
|
| @@ -778,9 +779,9 @@ void NavigationRequest::OnRedirectChecksComplete(
|
| return;
|
| }
|
|
|
| - if (result == NavigationThrottle::BLOCK_REQUEST) {
|
| + if (result == NavigationThrottle::BLOCK_REQUEST ||
|
| + result == NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE) {
|
| OnRequestFailed(false, net::ERR_BLOCKED_BY_CLIENT);
|
| -
|
| // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
|
| // destroyed the NavigationRequest.
|
| return;
|
|
|