Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index b7df6ff0de46ac3a6461141a874baaf65ee52033..6c95a6c9c55d65603535b2bba14a4e808c942d8a 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1006,7 +1006,7 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {
   // same-process navigation is interrupted by a synchronous renderer-initiated
   // navigation.
   if (navigation_handle_ &&
-      navigation_handle_->GetURL() != validated_params.url) {
+      (navigation_handle_->GetURL() != validated_params.url)) {

[Charlie Reis, 2016/02/16 21:55:07]

This change doesn't seem necessary, but I don't feel strongly either way.  (The
main cost is for people searching through git blame.)

[Charlie Harrison, 2016/02/16 22:55:23]

Removed.

     navigation_handle_.reset();
   }
 
@@ -1014,11 +1014,14 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {
   // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad
   // message.
   if (!navigation_handle_) {
+    // There is no pending NavigationEntry in these cases, so pass 0 as the
+    // nav_id.
     navigation_handle_ =
         NavigationHandleImpl::Create(validated_params.url, frame_tree_node_,
                                      true,   // is_synchronous
                                      validated_params.is_srcdoc,
-                                     base::TimeTicks::Now());
+                                     base::TimeTicks::Now(),
+                                     0);

[Charlie Reis, 2016/02/16 21:55:07]

nit: This fits on the previous line.  Call sites don't need to have each
parameter on their own line.  (I'll defer if git cl format did this, but I'd be
surprised since the first line has two parameters as well.)

[Charlie Harrison, 2016/02/16 22:55:22]

Done.

   }
 
   accessibility_reset_count_ = 0;