Additional fixes for prerender/instant + browsing history.

content/browser/tab_contents/test_tab_contents.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
 #pragma once
 
 #include "content/browser/tab_contents/tab_contents.h"
 #include "webkit/glue/webpreferences.h"
@@ skipping 24 matching lines @@
     DidNavigate(render_view_host, params);
   }
 
   // Promote GetWebkitPrefs to public.
   WebPreferences TestGetWebkitPrefs() {
     return GetWebkitPrefs();
   }
 
   // Prevent interaction with views.
   virtual bool CreateRenderViewForRenderManager(
-      RenderViewHost* render_view_host);
-  virtual void UpdateRenderViewSizeForRenderManager() {}
+      RenderViewHost* render_view_host) OVERRIDE;
+  virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE {}
 
   // Returns a clone of this TestTabContents. The returned object is also a
   // TestTabContents. The caller owns the returned object.
-  virtual TabContents* Clone();
+  virtual TabContents* Clone() OVERRIDE;
 
   // Creates a pending navigation to the given URL with the default parameters
   // and then commits the load with a page ID one larger than any seen. This
   // emulates what happens on a new navigation.
   void NavigateAndCommit(const GURL& url);
 
   // Simulates the appropriate RenderView (pending if any, current otherwise)
   // sending a navigate notification for the NavigationController pending entry.
   void CommitPendingNavigation();
 
   // Simulates the current RVH notifying that it has unloaded so that the
   // pending RVH navigation can proceed.
   // Does nothing if no cross-navigation is pending.
   void ProceedWithCrossSiteNavigation();
 
   // Set by individual tests.
   bool transition_cross_site;
 
   // Allow mocking of the RenderViewHostDelegate::View.
-  virtual RenderViewHostDelegate::View* GetViewDelegate();
+  virtual RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
   void set_view_delegate(RenderViewHostDelegate::View* view) {
     delegate_view_override_ = view;
   }
+

[Charlie Reis, 2011/08/13 06:26:27]

Remove one of the blank lines.

[cbentzel, 2011/08/13 14:31:14]

Done.

+
+  // Establish expected arguments for |SetHistoryLengthAndPrune()|. When
+  // |SetHistoryLengthAndPrune()| is called, the arguments are compared
+  // with the expected arguments specified here.
+  void ExpectSetHistoryLengthAndPrune(const SiteInstance* site_instance,
+                                      int history_length,
+                                      int32 min_page_id);
+
+  // Compares the arguments passed in with the expected arguments passed in
+  // to |ExpectSetHistoryLengthAndPrune()|.
+  virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
+                                        int history_length,
+                                        int32 min_page_id) OVERRIDE;
+
  private:
   RenderViewHostDelegate::View* delegate_view_override_;
+
+  // Expectations for arguments of |SetHistoryLengthAndPrune()|.
+  bool expect_set_history_length_and_prune_;
+  const SiteInstance* expect_set_history_length_and_prune_site_instance_;

[Charlie Reis, 2011/08/13 06:26:27]

Might not be safe memory-wise to keep a raw pointer to a SiteInstance.  Either
keep a scoped refptr or the SiteInstance's ID.

[cbentzel, 2011/08/13 14:31:14]

This may be NULL, so kept a scoped_refptr. In this case we are only comparing
pointer values rather than dereferencing, but may as well be safer.

+  int expect_set_history_length_and_prune_history_length_;
+  int32 expect_set_history_length_and_prune_min_page_id_;
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_