Introduce AncestorThrottle, which will process 'X-Frame-Options' headers.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2151 matching lines @@
   SendAndRunNestedMessageLoop(new FrameHostMsg_RunJavaScriptMessage(
       routing_id_, message, default_value, frame_url, type, &success, result));
   return success;
 }
 
 void RenderFrameImpl::LoadNavigationErrorPage(
     const WebURLRequest& failed_request,
     const WebURLError& error,
     bool replace) {
   std::string error_html;
-  GetContentClient()->renderer()->GetNavigationErrorStrings(
-      this, failed_request, error, &error_html, nullptr);
+
+  if (!RenderThreadImpl::current() ||
+      !RenderThreadImpl::current()->layout_test_mode()) {

[Mike West, 2016/04/25 13:06:21]

It's super-strange that we're checking whether we're in layout test mode here.
Why was the original code doing this check? What tests will fail based on this
change? The world may never know (until the bots come back with results)!

+    GetContentClient()->renderer()->GetNavigationErrorStrings(
+        this, failed_request, error, &error_html, nullptr);
+  }
 
   frame_->loadHTMLString(error_html,
                          GURL(kUnreachableWebDataURL),
                          error.unreachableURL,
                          replace);
 }
 
 void RenderFrameImpl::DidMeaningfulLayout(
     blink::WebMeaningfulLayout layout_type) {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
@@ skipping 3571 matching lines @@
       render_view_->renderer_preferences_.disable_client_blocked_error_page) {
     return false;
   }
 
   // Allow the embedder to suppress an error page.
   if (GetContentClient()->renderer()->ShouldSuppressErrorPage(
           this, unreachable_url)) {
     return false;
   }
 
-  if (RenderThreadImpl::current() &&
-      RenderThreadImpl::current()->layout_test_mode()) {
-    return false;

[Mike West, 2016/04/25 13:06:21]

Returning false here for layout tests means that blink hangs, as nothing ever
loads in the frame, and therefore no `load` event is fired. :(

-  }
-
   return true;
 }
 
 GURL RenderFrameImpl::GetLoadingUrl() const {
   WebDataSource* ds = frame_->dataSource();
 
   GURL overriden_url;
   if (MaybeGetOverriddenURL(ds, &overriden_url))
     return overriden_url;
 
@@ skipping 251 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content