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

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_request.h"
 
 #include <utility>
 
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
@@ skipping 428 matching lines @@
       render_frame_host, response->head.headers.get(),
       response->head.connection_info, ssl_status, request_id,
       common_params_.should_replace_current_entry, is_download, is_stream,
       base::Closure(),
       base::Bind(&NavigationRequest::OnWillProcessResponseChecksComplete,
                  base::Unretained(this)));
 }
 
 void NavigationRequest::OnRequestFailed(bool has_stale_copy_in_cache,
                                         int net_error) {
-  DCHECK(state_ == STARTED);
+  DCHECK(state_ == STARTED || state_ == RESPONSE_STARTED);
   state_ = FAILED;
   navigation_handle_->set_net_error_code(static_cast<net::Error>(net_error));
   frame_tree_node_->navigator()->FailedNavigation(
       frame_tree_node_, has_stale_copy_in_cache, net_error);
 }
 
 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
   if (frame_tree_node_->IsMainFrame()) {
     TRACE_EVENT_ASYNC_END_WITH_TIMESTAMP0(
         "navigation", "Navigation timeToNetworkStack", navigation_handle_.get(),
         timestamp);
   }
 
   frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
                                                         common_params_.url);
 }
 
 void NavigationRequest::OnStartChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   CHECK(result != NavigationThrottle::DEFER);
+  CHECK(result != NavigationThrottle::BLOCK_RESPONSE);

[clamy, 2016/12/09 17:14:01]

nit: this should be changed to DCHECK. Same below.

 
   // 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.
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
 
   if (result == NavigationThrottle::BLOCK_REQUEST) {
     OnRequestFailed(false, net::ERR_BLOCKED_BY_CLIENT);
+    // DO NOT ADD CODE after this. The previous call to OnRequestFailed have

[clamy, 2016/12/09 17:14:01]

nit:s/have/has

[arthursonzogni, 2016/12/13 15:32:13]

Done

+    // destroyed the NavigationRequest.
     return;
   }
 
   // Use the SiteInstance of the navigating RenderFrameHost to get access to
   // the StoragePartition. Using the url of the navigation will result in a
   // wrong StoragePartition being picked when a WebView is navigating.
   DCHECK_NE(AssociatedSiteInstanceType::NONE, associated_site_instance_type_);
   RenderFrameHostImpl* navigating_frame_host =
       associated_site_instance_type_ == AssociatedSiteInstanceType::SPECULATIVE
           ? frame_tree_node_->render_manager()->speculative_frame_host()
@@ skipping 53 matching lines @@
           parent_is_main_frame, IsSecureFrame(frame_tree_node_->parent()),
           frame_tree_node_->frame_tree_node_id(), is_for_guests_only,
           report_raw_headers),
       std::move(navigation_ui_data),
       navigation_handle_->service_worker_handle(), this);
 }
 
 void NavigationRequest::OnRedirectChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   CHECK(result != NavigationThrottle::DEFER);
+  CHECK(result != NavigationThrottle::BLOCK_RESPONSE);
 
   // 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.
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
 
   loader_->FollowRedirect();
 }
 
 void NavigationRequest::OnWillProcessResponseChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   CHECK(result != NavigationThrottle::DEFER);
 
   // 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.
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
 
+  if (result == NavigationThrottle::BLOCK_RESPONSE) {
+    OnRequestFailed(false, net::ERR_BLOCKED_BY_RESPONSE);
+    // DO NOT ADD CODE after this. The previous call to OnRequestFailed have

[clamy, 2016/12/09 17:14:01]

nit:s/have/has

[arthursonzogni, 2016/12/13 15:32:13]

Done.

+    // destroyed the NavigationRequest.
+    return;
+  }
+
   // Have the processing of the response resume in the network stack.
   loader_->ProceedWithResponse();
 
   CommitNavigation();
 
   // DO NOT ADD CODE after this. The previous call to CommitNavigation caused
   // the destruction of the NavigationRequest.
 }
 
 void NavigationRequest::CommitNavigation() {
@@ skipping 11 matching lines @@
   TransferNavigationHandleOwnership(render_frame_host);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content