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..12a5dcc3c2de7a50f96b53d4fb2ccca1eb878014 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -296,6 +296,10 @@ RenderFrameHostImpl* RenderFrameHostManager::Navigate(
     // The navigating RenderFrameHost should take ownership of the
     // NavigationHandle that came from the transferring RenderFrameHost.
     DCHECK(transfer_navigation_handle_);
+    // Update the pending NavigationEntry ID on the handle as well.

[nasko, 2016/03/11 17:10:06]

nit: Empty line before the comment makes it a bit more readable.

[Charlie Reis, 2016/03/11 20:12:48]

Done.

+    // TODO(creis): Make this line unnecessary by avoiding having a pending
+    // entry for transfer navigations.  See https://crbug.com/495161.
+    transfer_navigation_handle_->set_pending_nav_entry_id(entry.GetUniqueID());
     dest_render_frame_host->SetNavigationHandle(
         std::move(transfer_navigation_handle_));
   }