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

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index ba4190dd0c8206bd0c164e8f500b9123bda32435..6f8a307043eae3241624f9ae1890f61932517ef3 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -126,6 +126,14 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   // will not have a NavigationEntry associated with it, and this will return 0.
   int pending_nav_entry_id() const { return pending_nav_entry_id_; }
 
+  // Changes the pending NavigationEntry ID for this handle.  This is currently
+  // required during transfer navigations.
+  // TODO(creis): Remove this when transfer navigations do not require pending
+  // entries.  See https://crbug.com/495161.
+  void set_pending_nav_entry_id(int nav_entry_id) {

[Charlie Harrison, 2016/03/11 15:15:14]

If this is only required for transfer navigations, maybe name it something like
UpdateEntryIdForTransfer? This makes the intention clear without having to find
the comment.

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

Done.

+    pending_nav_entry_id_ = nav_entry_id;
+  }
+
   void set_net_error_code(net::Error net_error_code) {
     net_error_code_ = net_error_code;
   }
@@ -277,7 +285,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   const base::TimeTicks navigation_start_;
 
   // The unique id of the corresponding NavigationEntry.
-  const int pending_nav_entry_id_;
+  int pending_nav_entry_id_;
 
   // This callback will be run when all throttle checks have been performed.
   ThrottleChecksFinishedCallback complete_callback_;