Ensure the NavigationHandle's nav entry ID is updated during transfers.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index d99018945366b5feda09daea5fd64f3ce9334497..d6551a25262e8f8f22261423010cfdda2277f5f1 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -293,9 +293,16 @@ RenderFrameHostImpl* RenderFrameHostManager::Navigate(
           entry.transferred_global_request_id()) {
     cross_site_transferring_request_->ReleaseRequest();
 
+    DCHECK(transfer_navigation_handle_);
+
+    // Update the pending NavigationEntry ID on the transferring handle.
+    // TODO(creis): Make this line unnecessary by avoiding having a pending
+    // entry for transfer navigations.  See https://crbug.com/495161.
+    transfer_navigation_handle_->update_entry_id_for_transfer(
+        entry.GetUniqueID());
+
     // The navigating RenderFrameHost should take ownership of the
     // NavigationHandle that came from the transferring RenderFrameHost.
-    DCHECK(transfer_navigation_handle_);
     dest_render_frame_host->SetNavigationHandle(
         std::move(transfer_navigation_handle_));
   }