PlzNavigate: Invoke didStartProvisionalLoad() when the renderer initiates a navigation in startLoad(

chrome/renderer/net/net_error_helper.cc

 // Copyright (c) 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 "chrome/renderer/net/net_error_helper.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 48 matching lines @@
 using error_page::ErrorPageParams;
 using error_page::LocalizedError;
 using error_page::NetErrorHelperCore;
 
 namespace {
 
 // Number of seconds to wait for the navigation correction service to return
 // suggestions.  If it takes too long, just use the local error page.
 const int kNavigationCorrectionFetchTimeoutSec = 3;
 
-NetErrorHelperCore::PageType GetLoadingPageType(RenderFrame* render_frame) {
-  blink::WebFrame* web_frame = render_frame->GetWebFrame();
-  GURL url = web_frame->provisionalDataSource()->getRequest().url();
+NetErrorHelperCore::PageType GetLoadingPageType(
+    blink::WebDataSource* data_source) {
+  GURL url = data_source->getRequest().url();
   if (!url.is_valid() || url.spec() != kUnreachableWebDataURL)
     return NetErrorHelperCore::NON_ERROR_PAGE;
   return NetErrorHelperCore::ERROR_PAGE;
 }
 
 NetErrorHelperCore::FrameType GetFrameType(RenderFrame* render_frame) {
   if (render_frame->IsMainFrame())
     return NetErrorHelperCore::MAIN_FRAME;
   return NetErrorHelperCore::SUB_FRAME;
 }
@@ skipping 29 matching lines @@
 
 void NetErrorHelper::ButtonPressed(
     error_page::NetErrorHelperCore::Button button) {
   core_->ExecuteButtonPress(button);
 }
 
 void NetErrorHelper::TrackClick(int tracking_id) {
   core_->TrackClick(tracking_id);
 }
 
-void NetErrorHelper::DidStartProvisionalLoad() {
+void NetErrorHelper::DidStartProvisionalLoad(
+    blink::WebDataSource* data_source) {
   core_->OnStartLoad(GetFrameType(render_frame()),
-                     GetLoadingPageType(render_frame()));
+                     GetLoadingPageType(data_source));
 }
 
 void NetErrorHelper::DidCommitProvisionalLoad(bool is_new_navigation,
                                               bool is_same_page_navigation) {
   // If this is a "same page" navigation, it's not a real navigation.  There
   // wasn't a start event for it, either, so just ignore it.
   if (is_same_page_navigation)
     return;
 
   // Invalidate weak pointers from old error page controllers. If loading a new
@@ skipping 250 matching lines @@
 
 void NetErrorHelper::OnNetworkDiagnosticsClientRequest(
     chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request) {
   DCHECK(!network_diagnostics_client_binding_.is_bound());
   network_diagnostics_client_binding_.Bind(std::move(request));
 }
 
 void NetErrorHelper::SetCanShowNetworkDiagnosticsDialog(bool can_show) {
   core_->OnSetCanShowNetworkDiagnosticsDialog(can_show);
 }