Create NavigationHandle after beforeunload with PlzNavigate.

content/browser/frame_host/frame_tree_node.cc

 // Copyright 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 "content/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 382 matching lines @@
   // notifications for Javascript URLS.
   DCHECK(!navigation_request->common_params().url.SchemeIs(
       url::kJavaScriptScheme));
 
   bool was_previously_loading = frame_tree()->IsLoading();
 
   // There's no need to reset the state: there's still an ongoing load, and the
   // RenderFrameHostManager will take care of updates to the speculative
   // RenderFrameHost in DidCreateNavigationRequest below.
   if (was_previously_loading) {
-    if (navigation_request_) {
+    if (navigation_request_ && navigation_request_->navigation_handle()) {
       // Mark the old request as aborted.
       navigation_request_->navigation_handle()->set_net_error_code(
           net::ERR_ABORTED);
     }
     ResetNavigationRequest(true, true);
   }
 
   navigation_request_ = std::move(navigation_request);
   render_manager()->DidCreateNavigationRequest(navigation_request_.get());
 
@@ skipping 82 matching lines @@
 }
 
 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
   loading_progress_ = load_progress;
   frame_tree_->UpdateLoadProgress();
 }
 
 bool FrameTreeNode::StopLoading() {
   if (IsBrowserSideNavigationEnabled()) {
     if (navigation_request_) {
-      navigation_request_->navigation_handle()->set_net_error_code(
-          net::ERR_ABORTED);
-      navigator_->DiscardPendingEntryIfNeeded(
-          navigation_request_->navigation_handle());
+      if (navigation_request_->navigation_handle()) {
+        navigation_request_->navigation_handle()->set_net_error_code(
+            net::ERR_ABORTED);
+      }
+      int expected_pending_nav_entry_id =
+          navigation_request_->navigation_handle()
+              ? navigation_request_->navigation_handle()->pending_nav_entry_id()
+              : navigation_request_->nav_entry_id();

[nasko, 2017/05/24 14:20:03]

nit: Can't we combine this with the previous if statement?
expected_pending_nav_entry_id can be initialized to the nav_entry_id() and if
the handle is not null, updated to be the pending_nav_entry_id.

[clamy, 2017/05/24 18:34:38]

Done.

+      navigator_->DiscardPendingEntryIfNeeded(expected_pending_nav_entry_id);
     }
     ResetNavigationRequest(false, true);
   }
 
   // TODO(nasko): see if child frames should send IPCs in site-per-process
   // mode.
   if (!IsMainFrame())
     return true;
 
   render_manager_.Stop();
@@ skipping 14 matching lines @@
   RenderFrameHostImpl* current_frame_host =
       render_manager_.current_frame_host();
   DCHECK(current_frame_host);
   current_frame_host->ResetLoadingState();
 
   if (IsBrowserSideNavigationEnabled()) {
     RenderFrameHostImpl* speculative_frame_host =
         render_manager_.speculative_frame_host();
     if (speculative_frame_host)
       speculative_frame_host->ResetLoadingState();
+    if (navigation_request_)
+      ResetNavigationRequest(false, true);

[nasko, 2017/05/24 14:20:03]

nit: Add a comment why we don't need to set the error code on the navigation
handle here - we don't have one before we get the response from the beforeunload
handler.

[clamy, 2017/05/24 18:34:38]

Done.

   } else {
     RenderFrameHostImpl* pending_frame_host =
         render_manager_.pending_frame_host();
     if (pending_frame_host)
       pending_frame_host->ResetLoadingState();
   }
 }
 
 void FrameTreeNode::OnSetHasReceivedUserGesture() {
   render_manager_.OnSetHasReceivedUserGesture();
@@ skipping 12 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content