Fix headless_browsertests failures with PlzNavigate.

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"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
+#include "base/process/process_handle.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_frame_trace_recorder.h"
 #include "content/browser/devtools/devtools_manager.h"
 #include "content/browser/devtools/devtools_session.h"
 #include "content/browser/devtools/page_navigation_throttle.h"
 #include "content/browser/devtools/protocol/dom_handler.h"
 #include "content/browser/devtools/protocol/emulation_handler.h"
@@ skipping 16 matching lines @@
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "net/base/net_errors.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/render_widget_host_view.h"
 #include "device/power_save_blocker/power_save_blocker.h"
 #endif
 
 namespace content {
 
 typedef std::vector<RenderFrameDevToolsAgentHost*> Instances;
 
@@ skipping 315 matching lines @@
 void RenderFrameDevToolsAgentHost::OnBeforeNavigation(
     NavigationHandle* navigation_handle) {
   FrameTreeNode* frame_tree_node =
       static_cast<NavigationHandleImpl*>(navigation_handle)->frame_tree_node();
   RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(frame_tree_node);
   if (agent_host)
     agent_host->AboutToNavigate(navigation_handle);
 }
 
 // static
+void RenderFrameDevToolsAgentHost::OnFailedNavigation(RenderFrameHost* host,
+                                                      net::Error error_code) {
+  RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(host);
+  if (agent_host)
+    agent_host->OnFailedNavigation(error_code);
+}
+
+// static
 std::unique_ptr<NavigationThrottle>
 RenderFrameDevToolsAgentHost::CreateThrottleForNavigation(
     NavigationHandle* navigation_handle) {
   FrameTreeNode* frame_tree_node =
       static_cast<NavigationHandleImpl*>(navigation_handle)->frame_tree_node();
   while (frame_tree_node && frame_tree_node->parent()) {
     frame_tree_node = frame_tree_node->parent();
   }
   RenderFrameDevToolsAgentHost* agent_host = FindAgentHost(frame_tree_node);
   // Note Page.setControlNavigations is intended to control navigations in the
@@ skipping 318 matching lines @@
 void RenderFrameDevToolsAgentHost::AboutToNavigate(
     NavigationHandle* navigation_handle) {
   if (!IsBrowserSideNavigationEnabled())
     return;
   DCHECK(current_);
   navigating_handles_.insert(navigation_handle);
   current_->Suspend();
   DCHECK(CheckConsistency());
 }
 
+void RenderFrameDevToolsAgentHost::OnFailedNavigation(net::Error error_code) {
+  DCHECK(IsBrowserSideNavigationEnabled());
+  if (!session())
+    return;
+
+  protocol::NetworkHandler* handler =
+      protocol::NetworkHandler::FromSession(session());
+  if (!handler)
+    return;
+
+  static int next_id = 0;
+  std::string request_id = base::IntToString(base::GetCurrentProcId()) + "." +

[dgozman, 2017/02/27 17:31:31]

I'd move protocol-specific code (like request id generation or error message) to
NetworkHandler instead.

[jam, 2017/02/27 20:47:35]

Done.

+                           base::IntToString(++next_id);
+  std::string error_string = net::ErrorToString(error_code);
+  bool cancelled = error_code == net::Error::ERR_ABORTED;
+  handler->NavigationFailed(request_id, error_string, cancelled);
+}
+
 void RenderFrameDevToolsAgentHost::RenderFrameHostChanged(
     RenderFrameHost* old_host,
     RenderFrameHost* new_host) {
   // CommitPending may destruct |this|.
   scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);
 
   if (session())
     protocol::TargetHandler::FromSession(session())->UpdateFrames();
 
   if (IsBrowserSideNavigationEnabled())
@@ skipping 419 matching lines @@
     RenderFrameHost* host) {
   return (current_ && current_->host() == host) ||
       (pending_ && pending_->host() == host);
 }
 
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return current_ && current_->host()->GetParent();
 }
 
 }  // namespace content