Fix NetErrorTabHelper with PlzNavigate.

chrome/browser/net/net_error_tab_helper.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 "chrome/browser/net/net_error_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
@@ skipping 86 matching lines @@
   // Ignore subframe creation - only main frame error pages can link to the
   // platform's network diagnostics dialog.
   if (render_frame_host->GetParent())
     return;
   render_frame_host->Send(
       new ChromeViewMsg_SetCanShowNetworkDiagnosticsDialog(
           render_frame_host->GetRoutingID(),
           CanShowNetworkDiagnosticsDialog()));
 }
 
-void NetErrorTabHelper::DidStartNavigationToPendingEntry(
-    const GURL& url,
-    content::ReloadType reload_type) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  if (!is_error_page_)
+void NetErrorTabHelper::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame())
     return;
 
-  // Only record reloads.
-  if (reload_type != content::ReloadType::NONE) {
+  if (navigation_handle->IsErrorPage() &&
+      navigation_handle->GetPageTransition() == ui::PAGE_TRANSITION_RELOAD) {
     error_page::RecordEvent(
         error_page::NETWORK_ERROR_PAGE_BROWSER_INITIATED_RELOAD);
   }
-}
-
-void NetErrorTabHelper::DidStartProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    bool is_error_page,
-    bool is_iframe_srcdoc) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  if (render_frame_host->GetParent())
-    return;
-
-  is_error_page_ = is_error_page;
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  UpdateHasOfflinePages(render_frame_host);
+  UpdateHasOfflinePages(navigation_handle->GetFrameTreeNodeId());
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 }
 
-void NetErrorTabHelper::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    PageTransition transition_type) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+void NetErrorTabHelper::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame())
+    return;
 
-  if (render_frame_host->GetParent())
-    return;
+  if (IsDnsError(navigation_handle->GetNetErrorCode())) {
+    dns_error_active_ = true;
+    OnMainFrameDnsError();
+  }
 
   // Resend status every time an error page commits; this is somewhat spammy,
   // but ensures that the status will make it to the real error page, even if
   // the link doctor loads a blank intermediate page or the tab switches
   // renderer processes.
-  if (is_error_page_ && dns_error_active_) {
+  if (navigation_handle->IsErrorPage() && dns_error_active_) {
     dns_error_page_committed_ = true;
     DVLOG(1) << "Committed error page; resending status.";
     SendInfo();
-  } else {
+  } else if (navigation_handle->HasCommitted() &&
+             !navigation_handle->IsErrorPage()) {
     dns_error_active_ = false;
     dns_error_page_committed_ = false;
   }
 }
 
-void NetErrorTabHelper::DidFailProvisionalLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description,
-    bool was_ignored_by_handler) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  if (render_frame_host->GetParent())
-    return;
-
-  if (IsDnsError(error_code)) {
-    dns_error_active_ = true;
-    OnMainFrameDnsError();
-  }
-}
-
 bool NetErrorTabHelper::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   if (render_frame_host != web_contents()->GetMainFrame())
     return false;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NetErrorTabHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RunNetworkDiagnostics,
                         RunNetworkDiagnostics)
 #if BUILDFLAG(ANDROID_JAVA_UI)
@@ skipping 100 matching lines @@
   // Sanitize URL prior to running diagnostics on it.
   RunNetworkDiagnosticsHelper(url.GetOrigin().spec());
 }
 
 void NetErrorTabHelper::RunNetworkDiagnosticsHelper(
     const std::string& sanitized_url) {
   ShowNetworkDiagnosticsDialog(web_contents(), sanitized_url);
 }
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-void NetErrorTabHelper::UpdateHasOfflinePages(
-    content::RenderFrameHost* render_frame_host) {
+void NetErrorTabHelper::UpdateHasOfflinePages(int frame_tree_node_id) {
   // TODO(chili): remove entirely in M55 if AsyncLoading does not need this.
-  SetHasOfflinePages(render_frame_host->GetFrameTreeNodeId(), false);
+  SetHasOfflinePages(frame_tree_node_id, false);
 }
 
 void NetErrorTabHelper::SetHasOfflinePages(int frame_tree_node_id,
                                            bool has_offline_pages) {
   content::RenderFrameHost* render_frame_host =
       web_contents()->FindFrameByFrameTreeNodeId(frame_tree_node_id);
   if (render_frame_host == nullptr)
     return;
 
   render_frame_host->Send(new ChromeViewMsg_SetHasOfflinePages(
@@ skipping 13 matching lines @@
 
 bool NetErrorTabHelper::IsFromErrorPage() const {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   return entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR);
 }
 
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 
 }  // namespace chrome_browser_net