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

content/browser/loader/navigation_resource_throttle.cc

Index: content/browser/loader/navigation_resource_throttle.cc
diff --git a/content/browser/loader/navigation_resource_throttle.cc b/content/browser/loader/navigation_resource_throttle.cc
index 44fd0c131ff413fd0d90d0d4c07adae7dedc338b..effba19edd974005b66ae415ccdde983094383ca 100644
--- a/content/browser/loader/navigation_resource_throttle.cc
+++ b/content/browser/loader/navigation_resource_throttle.cc
@@ -92,7 +92,8 @@ void CheckWillRedirectRequestOnUIThread(
       base::Bind(&SendCheckResultToIOThread, callback));
 }
 
-void WillProcessResponseOnUIThread(
+void CheckWillProcessResponseOnUIThread(
+    UIChecksPerformedCallback callback,
     int render_process_id,
     int render_frame_host_id,
     scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -107,7 +108,9 @@ void WillProcessResponseOnUIThread(
   if (!navigation_handle)
     return;
 
-  navigation_handle->ReadyToCommitNavigation(render_frame_host, headers);
+  navigation_handle->WillProcessResponse(
+      render_frame_host, headers,
+      base::Bind(&SendCheckResultToIOThread, callback));
 }
 
 }  // namespace
@@ -204,10 +207,14 @@ void NavigationResourceThrottle::WillProcessResponse(bool* defer) {
         request_->response_headers()->raw_headers());
   }
 
+  UIChecksPerformedCallback callback =
+      base::Bind(&NavigationResourceThrottle::OnUIChecksPerformed,
+                 weak_ptr_factory_.GetWeakPtr());
+
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&WillProcessResponseOnUIThread, render_process_id,
-                 render_frame_id, response_headers));
+      base::Bind(&CheckWillProcessResponseOnUIThread, callback,
+                 render_process_id, render_frame_id, response_headers));

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

You need to set *defer=true somewhere here, otherwise the navigation will
proceed.

 }
 
 const char* NavigationResourceThrottle::GetNameForLogging() const {