(Re-)introduce AncestorThrottle to handle 'X-Frame-Options'.

content/browser/frame_host/navigation_handle_impl.cc

Index: content/browser/frame_host/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index 93d6b99d2dfa2acf4898ce6216306ed2dd67302c..417b2c32734784af2334559118ededa1bbcd49c6 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -9,6 +9,7 @@
 #include "content/browser/browsing_data/clear_site_data_throttle.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
+#include "content/browser/frame_host/ancestor_throttle.h"
 #include "content/browser/frame_host/debug_urls.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
@@ -290,7 +291,7 @@ void NavigationHandleImpl::CancelDeferredNavigation(
   DCHECK(state_ == DEFERRING_START || state_ == DEFERRING_REDIRECT);
   DCHECK(result == NavigationThrottle::CANCEL_AND_IGNORE ||
          result == NavigationThrottle::CANCEL);
-  state_ = CANCELING;
+  state_ = CANCELING_REQUEST;

[clamy, 2016/12/06 17:09:43]

Note: technically the navigation could be cancelled in DEFERRING_RESPONSE state
(DCHECK above is wrong). In that case, would setting the state to
CANCELING_REQUEST still make sense?

[arthursonzogni, 2016/12/07 16:25:02]

I updated the DCHECK.
As I said above, I will merge the two state. Then there is no more problems.

I made a new test with two navigation throttles, one with BLOCK_RESPONSE, the
other one with PROCEED. It checks that the navigation is canceled and the second
throttle is not called.

   RunCompleteCallback(result);
 }
 
@@ -585,13 +586,16 @@ NavigationHandleImpl::CheckWillStartRequest() {
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
       case NavigationThrottle::BLOCK_REQUEST:
-        state_ = CANCELING;
+        state_ = CANCELING_REQUEST;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_START;
         next_index_ = i + 1;
         return result;
+
+      case NavigationThrottle::BLOCK_RESPONSE:
+        NOTREACHED();
     }
   }
   next_index_ = 0;
@@ -613,7 +617,7 @@ NavigationHandleImpl::CheckWillRedirectRequest() {
 
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
-        state_ = CANCELING;
+        state_ = CANCELING_REQUEST;
         return result;
 
       case NavigationThrottle::DEFER:
@@ -622,6 +626,7 @@ NavigationHandleImpl::CheckWillRedirectRequest() {
         return result;
 
       case NavigationThrottle::BLOCK_REQUEST:
+      case NavigationThrottle::BLOCK_RESPONSE:
         NOTREACHED();
     }
   }
@@ -649,7 +654,11 @@ NavigationHandleImpl::CheckWillProcessResponse() {
 
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
-        state_ = CANCELING;
+        state_ = CANCELING_REQUEST;
+        return result;
+
+      case NavigationThrottle::BLOCK_RESPONSE:
+        state_ = CANCELING_RESPONSE;
         return result;
 
       case NavigationThrottle::DEFER:
@@ -775,6 +784,7 @@ void NavigationHandleImpl::RegisterNavigationThrottles() {
   // GetNavigationThrottles is not assigned to throttles_ directly because it
   // would overwrite any throttle previously added with
   // RegisterThrottleForTesting.
+
   ScopedVector<NavigationThrottle> throttles_to_register =
       GetDelegate()->CreateThrottlesForNavigation(this);
   std::unique_ptr<NavigationThrottle> devtools_throttle =
@@ -787,6 +797,11 @@ void NavigationHandleImpl::RegisterNavigationThrottles() {
   if (clear_site_data_throttle)
     throttles_to_register.push_back(std::move(clear_site_data_throttle));
 
+  std::unique_ptr<content::NavigationThrottle> ancestor_throttle =
+      content::AncestorThrottle::MaybeCreateThrottleFor(this);
+  if (ancestor_throttle)
+    throttles_.push_back(std::move(ancestor_throttle));
+
   if (throttles_to_register.size() > 0) {
     throttles_.insert(throttles_.begin(), throttles_to_register.begin(),
                       throttles_to_register.end());