| 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 61ee436568545c0c9496d2c10deede33d92c12d4..f66158a3b3260ce1d8206342f70d81bbfe13b811 100644
|
| --- a/content/browser/frame_host/navigation_request.cc
|
| +++ b/content/browser/frame_host/navigation_request.cc
|
| @@ -711,7 +711,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
|
| @@ -804,7 +805,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
|
| @@ -812,9 +813,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;
|
|
|