Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE.

content/browser/frame_host/navigation_request.cc

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 cce181790f1f4e754e5879a56fc161e95326eae1..9f35dadd134cf627fd6464fb14fe82a6d276396b 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -581,7 +581,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
@@ -670,7 +671,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
@@ -678,6 +679,13 @@ void NavigationRequest::OnRedirectChecksComplete(
     return;
   }
 
+  if (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

[nasko, 2017/03/01 20:08:04]

nit: Empty line before the comment to keep it consistent with the block above.

[engedy, 2017/04/10 14:36:41]

Refactored away, N/A.

+    // destroyed the NavigationRequest.
+    return;
+  }
+
   loader_->FollowRedirect();
 }