PlzNavigate: check report_raw_headers based on the main frame

content/browser/devtools/render_frame_devtools_agent_host.cc

 // Copyright (c) 2012 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/devtools/render_frame_devtools_agent_host.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/guid.h"
@@ skipping 74 matching lines @@
 static RenderFrameDevToolsAgentHost* FindAgentHost(WebContents* web_contents) {
   if (!web_contents->GetMainFrame())
     return nullptr;
   return FindAgentHost(web_contents->GetMainFrame());
 }
 
 bool ShouldCreateDevToolsFor(RenderFrameHost* rfh) {
   return rfh->IsCrossProcessSubframe() || !rfh->GetParent();
 }
 
+bool ShouldCreateDevToolsForNode(FrameTreeNode* ftn) {
+  return ShouldCreateDevToolsFor(ftn->current_frame_host());

[clamy, 2017/01/11 13:47:29]

I'm not sure if we should check for the Speculative/Pending RFH here as well.

[dgozman, 2017/01/11 18:24:31]

Good question. Let's not for now - I hope PlzNavigate will make this a bit
easier in the future.

+}
+
+static RenderFrameDevToolsAgentHost* GetAgentHostFor(FrameTreeNode* ftn) {
+  while (ftn && !ShouldCreateDevToolsForNode(ftn))
+    ftn = ftn->parent();
+  return FindAgentHost(ftn);
+}
+
 }  // namespace
 
 // RenderFrameDevToolsAgentHost::FrameHostHolder -------------------------------
 
 class RenderFrameDevToolsAgentHost::FrameHostHolder {
  public:
   FrameHostHolder(
       RenderFrameDevToolsAgentHost* agent, RenderFrameHostImpl* host);
   ~FrameHostHolder();
 
@@ skipping 283 matching lines @@
   protocol::PageHandler* page_handler =
       protocol::PageHandler::FromSession(agent_host->session());
   if (!page_handler)
     return nullptr;
   return page_handler->CreateThrottleForNavigation(navigation_handle);
 }
 
 // static
 bool RenderFrameDevToolsAgentHost::IsNetworkHandlerEnabled(
     FrameTreeNode* frame_tree_node) {
-  RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(frame_tree_node);
+  RenderFrameDevToolsAgentHost* agent_host = GetAgentHostFor(frame_tree_node);
   if (!agent_host || !agent_host->session())
     return false;
   return protocol::NetworkHandler::FromSession(agent_host->session())
       ->enabled();
 }
 
 // static
 std::string RenderFrameDevToolsAgentHost::UserAgentOverride(
     FrameTreeNode* frame_tree_node) {
-  RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(frame_tree_node);
+  RenderFrameDevToolsAgentHost* agent_host = GetAgentHostFor(frame_tree_node);
   if (!agent_host || !agent_host->session())
     return std::string();
   return protocol::NetworkHandler::FromSession(agent_host->session())
       ->UserAgentOverride();
 }
 
 // static
 void RenderFrameDevToolsAgentHost::WebContentsCreated(
     WebContents* web_contents) {
   if (ShouldForceCreation()) {
@@ skipping 733 matching lines @@
     RenderFrameHost* host) {
   return (current_ && current_->host() == host) ||
       (pending_ && pending_->host() == host);
 }
 
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return current_ && current_->host()->GetParent();
 }
 
 }  // namespace content