Ensure that HistoryController's current entry is updated on inert commits.

content/renderer/history_controller.cc

 // Copyright 2014 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 151 matching lines @@
                                         WebHistoryCommitType commit_type,
                                         bool navigation_within_page) {
   if (commit_type == blink::WebBackForwardCommit) {
     if (!provisional_entry_)
       return;
     current_entry_.reset(provisional_entry_.release());
   } else if (commit_type == blink::WebStandardCommit) {
     CreateNewBackForwardItem(frame, item, navigation_within_page);
   } else if (commit_type == blink::WebInitialCommitInChildFrame) {
     UpdateForInitialLoadInChildFrame(frame, item);
+  } else {

[Nate Chapin, 2015/04/30 18:24:10]

Now that this if-else block includes all WebHistoryCommitType values, should it
be a switch?

[Charlie Reis, 2015/04/30 18:36:30]

Done.

+    // Even for inert commits (e.g., location.replace, client redirects), make
+    // sure the current entry gets updated, if there is one.
+    DCHECK_EQ(blink::WebHistoryInertCommit, commit_type);
+    if (current_entry_) {
+      if (HistoryEntry::HistoryNode* node =
+              current_entry_->GetHistoryNodeForFrame(frame)) {
+        node->set_item(item);
+      }
+    }
   }
 }
 
 HistoryEntry* HistoryController::GetCurrentEntry() {
   return current_entry_.get();
 }
 
 WebHistoryItem HistoryController::GetItemForNewChildFrame(
     RenderFrameImpl* frame) const {
   if (navigation_params_.get()) {
@@ skipping 21 matching lines @@
   if (!current_entry_) {
     current_entry_.reset(
         new HistoryEntry(new_item, target_frame->GetRoutingID()));
   } else {
     current_entry_.reset(current_entry_->CloneAndReplace(
         new_item, clone_children_of_target, target_frame, render_view_));
   }
 }
 
 }  // namespace content