WIP: Move 'X-Frame-Options' checking to the browser.

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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_handle_impl.h"
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ skipping 214 matching lines @@
   has_user_gesture_ = has_user_gesture;
   transition_ = transition;
   is_external_protocol_ = is_external_protocol;
 
   state_ = WILL_SEND_REQUEST;
   complete_callback_ = callback;
 
   // Register the navigation throttles. The ScopedVector returned by
   // GetNavigationThrottles is not assigned to throttles_ directly because it
   // would overwrite any throttle previously added with
   // RegisterThrottleForTesting.

[clamy, 2015/12/21 10:13:29]

If you move the XFOThrottle to content/, you can just add it to the
ScopedVector<NavigationThrottle> here (or below depending on when it should
execute).

   ScopedVector<NavigationThrottle> throttles_to_register =
       GetContentClient()->browser()->CreateThrottlesForNavigation(this);
   if (throttles_to_register.size() > 0) {
     throttles_.insert(throttles_.end(), throttles_to_register.begin(),
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillStartRequest();
@@ skipping 22 matching lines @@
   complete_callback_ = callback;
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillRedirectRequest();
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
 }
 
+void NavigationHandleImpl::WillProcessResponse(
+    RenderFrameHostImpl* render_frame_host,
+    scoped_refptr<net::HttpResponseHeaders> response_headers,
+    const ThrottleChecksFinishedCallback& callback) {
+  DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
+  render_frame_host_ = render_frame_host;
+  response_headers_ = response_headers;
+  state_ = READY_TO_COMMIT;
+
+  NavigationThrottle::ThrottleCheckResult result = CheckWillProcessResponse();
+
+  if (result != NavigationThrottle::PROCEED) {
+    DCHECK(result == NavigationThrottle::CANCEL ||
+           result == NavigationThrottle::CANCEL_AND_IGNORE);
+    complete_callback_ = callback;
+    RunCompleteCallback(result);
+  } else {
+    ReadyToCommitNavigation(render_frame_host, response_headers);
+  }
+}
+
 void NavigationHandleImpl::ReadyToCommitNavigation(
     RenderFrameHostImpl* render_frame_host,
     scoped_refptr<net::HttpResponseHeaders> response_headers) {
   DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
   render_frame_host_ = render_frame_host;
   response_headers_ = response_headers;
   state_ = READY_TO_COMMIT;
 
   // Only notify the WebContentsObservers when PlzNavigate is enabled, as
   // |render_frame_host_| may be wrong in the case of transfer navigations.
@@ skipping 69 matching lines @@
   }
   next_index_ = 0;
   state_ = WILL_REDIRECT_REQUEST;
 
   // Notify the delegate that a redirect was encountered and will be followed.
   GetDelegate()->DidRedirectNavigation(this);
 
   return NavigationThrottle::PROCEED;
 }
 
+NavigationThrottle::ThrottleCheckResult
+NavigationHandleImpl::CheckWillProcessResponse() {
+  DCHECK(state_ == READY_TO_COMMIT);
+  for (size_t i = next_index_; i < throttles_.size(); ++i) {
+    NavigationThrottle::ThrottleCheckResult result =
+        throttles_[i]->WillProcessResponse();
+    switch (result) {
+      case NavigationThrottle::PROCEED:
+        continue;
+
+      case NavigationThrottle::CANCEL:
+      case NavigationThrottle::CANCEL_AND_IGNORE:
+        state_ = CANCELING;
+        return result;
+
+      case NavigationThrottle::DEFER:
+      default:
+        NOTREACHED();
+    }
+  }
+  next_index_ = 0;
+  state_ = READY_TO_COMMIT;
+  return NavigationThrottle::PROCEED;
+}
+
 void NavigationHandleImpl::RunCompleteCallback(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(result != NavigationThrottle::DEFER);
   if (!complete_callback_.is_null())
     complete_callback_.Run(result);
 
   complete_callback_.Reset();
 }
 
 }  // namespace content