Pipe the devTools FrameId from blink into the browser for headless

headless/lib/browser/headless_web_contents_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 "headless/lib/browser/headless_web_contents_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 198 matching lines @@
 
   service_manager::InterfaceRegistry* interface_registry =
       render_frame_host->GetInterfaceRegistry();
 
   for (const MojoService& service : mojo_services_) {
     interface_registry->AddInterface(service.service_name,
                                      service.service_factory,
                                      browser()->BrowserMainThread());
   }
 
+  browser_context_->SetFrameTreeNodeId(render_frame_host->GetProcess()->GetID(),
+                                       render_frame_host->GetRoutingID(),
+                                       render_frame_host->GetFrameTreeNodeId());
+
   std::string devtools_agent_host_id =
       content::DevToolsAgentHost::GetOrCreateFor(render_frame_host)->GetId();
   render_frame_host_to_devtools_agent_host_id_[render_frame_host] =
       devtools_agent_host_id;
   devtools_agent_id_to_frame_tree_node_id_[devtools_agent_host_id] =
       render_frame_host->GetFrameTreeNodeId();
 }
 
 void HeadlessWebContentsImpl::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
+  browser_context_->RemoveFrameTreeNode(
+      render_frame_host->GetProcess()->GetID(),
+      render_frame_host->GetRoutingID());
+
   auto find_it =
       render_frame_host_to_devtools_agent_host_id_.find(render_frame_host);
   if (find_it == render_frame_host_to_devtools_agent_host_id_.end())
     return;
 
   devtools_agent_id_to_frame_tree_node_id_.erase(find_it->second);
   render_frame_host_to_devtools_agent_host_id_.erase(find_it);
 }
 
 bool HeadlessWebContentsImpl::GetFrameTreeNodeIdForDevToolsAgentHostId(
     const std::string& devtools_agent_host_id,
     int* frame_tree_node_id) const {
   const auto& find_it =
       devtools_agent_id_to_frame_tree_node_id_.find(devtools_agent_host_id);
   if (find_it == devtools_agent_id_to_frame_tree_node_id_.end())
     return false;
   *frame_tree_node_id = find_it->second;
   return true;
 }
 
+std::string
+HeadlessWebContentsImpl::GetUntrustedDevToolsFrameIdForFrameTreeNodeId(
+    int process_id,
+    int frame_tree_node_id) const {
+  return content::DevToolsAgentHost::
+      GetUntrustedDevToolsFrameIdForFrameTreeNodeId(process_id,
+                                                    frame_tree_node_id);
+}
+
+int HeadlessWebContentsImpl::GetMainFrameRenderProcessId() const {
+  return web_contents()->GetRenderProcessHost()->GetID();

[Charlie Reis, 2017/04/27 18:58:02]

Can you update this to web_contents()->GetMainFrame()->GetProcess()->GetID()? 
That will give us fewer places to update as we try to remove
GetRenderProcessHost().

[alex clarke (OOO till 29th), 2017/04/28 09:14:44]

Done.

+}
+
 bool HeadlessWebContentsImpl::OpenURL(const GURL& url) {
   if (!url.is_valid())
     return false;
   content::NavigationController::LoadURLParams params(url);
   params.transition_type = ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
   web_contents_->GetController().LoadURLWithParams(params);
   web_contents_delegate_->ActivateContents(web_contents_.get());
   web_contents_->Focus();
   return true;
@@ skipping 133 matching lines @@
 HeadlessWebContents::Builder::MojoService::MojoService() {}
 
 HeadlessWebContents::Builder::MojoService::MojoService(
     const std::string& service_name,
     const base::Callback<void(mojo::ScopedMessagePipeHandle)>& service_factory)
     : service_name(service_name), service_factory(service_factory) {}
 
 HeadlessWebContents::Builder::MojoService::~MojoService() {}
 
 }  // namespace headless