Additional fixes for prerender/instant + browsing history.

content/browser/tab_contents/navigation_controller.cc

 // Copyright (c) 2011 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.
 
 #include "content/browser/tab_contents/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 915 matching lines @@
     pending_entry_index_ = entry_count() - 1;
   if (transient_entry_index_ != -1) {
     // There's a transient entry. In this case we want the last committed to
     // point to the previous entry.
     transient_entry_index_ = entry_count() - 1;
     if (last_committed_entry_index_ != -1)
       last_committed_entry_index_--;
   }
 
   // Update the history in the RenderView.
-  tab_contents_->SetHistoryLengthAndClear(max_source_index);
+  // Note, I don't know if this makes sense if the active entry is transient.
+  NavigationEntry* active_entry = GetActiveEntry();
+  if (!active_entry) {
+    LOG(ERROR) << "!active_entry";
+    return;
+  }
+  tab_contents_->SetHistoryLengthAndClear(active_entry->site_instance(),
+                                          max_source_index,
+                                          active_entry->page_id());
 }
 
 void NavigationController::PruneAllButActive() {
   if (transient_entry_index_ != -1) {
     // There is a transient entry. Prune up to it.
     DCHECK_EQ(entry_count() - 1, transient_entry_index_);
     entries_.erase(entries_.begin(), entries_.begin() + transient_entry_index_);
     transient_entry_index_ = 0;
     last_committed_entry_index_ = -1;
     pending_entry_index_ = -1;
@@ skipping 224 matching lines @@
   size_t insert_index = 0;
   for (int i = 0; i < max_index; i++) {
     // When cloning a tab, copy all entries except interstitial pages
     if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntry>(
                           new NavigationEntry(*source.entries_[i])));
     }
   }
 }