Additional fixes for prerender/instant + browsing history.

content/browser/tab_contents/test_tab_contents.cc

Index: content/browser/tab_contents/test_tab_contents.cc
diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc
index 42521146c0e109390e7901fde8088d19a681c40e..b6a07c788325c050d85fbd9fa880c8e24f634ece 100644
--- a/content/browser/tab_contents/test_tab_contents.cc
+++ b/content/browser/tab_contents/test_tab_contents.cc
@@ -17,7 +17,11 @@ TestTabContents::TestTabContents(content::BrowserContext* browser_context,
                                  SiteInstance* instance)
     : TabContents(browser_context, instance, MSG_ROUTING_NONE, NULL, NULL),
       transition_cross_site(false),
-      delegate_view_override_(NULL) {
+      delegate_view_override_(NULL),
+      expect_set_history_length_and_prune_(false),
+      expect_set_history_length_and_prune_site_instance_(NULL),
+      expect_set_history_length_and_prune_history_length_(0),
+      expect_set_history_length_and_prune_min_page_id_(-1) {
 }
 
 TestRenderViewHost* TestTabContents::pending_rvh() const {
@@ -90,3 +94,23 @@ RenderViewHostDelegate::View* TestTabContents::GetViewDelegate() {
     return delegate_view_override_;
   return TabContents::GetViewDelegate();
 }
+
+void TestTabContents::ExpectSetHistoryLengthAndPrune(
+    const SiteInstance* site_instance,
+    int history_length,
+    int32 min_page_id) {
+  expect_set_history_length_and_prune_ = true;
+  expect_set_history_length_and_prune_site_instance_ = site_instance;
+  expect_set_history_length_and_prune_history_length_ = history_length;
+  expect_set_history_length_and_prune_min_page_id_ = min_page_id;
+}
+
+void TestTabContents::SetHistoryLengthAndPrune(
+    const SiteInstance* site_instance, int history_length, int32 min_page_id) {
+  EXPECT_TRUE(expect_set_history_length_and_prune_);
+  expect_set_history_length_and_prune_ = false;
+  EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance);
+  EXPECT_EQ(expect_set_history_length_and_prune_history_length_,
+            history_length);
+  EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id);
+}