| Index: chrome/browser/tab_contents/test_tab_contents.h
|
| diff --git a/chrome/browser/tab_contents/test_tab_contents.h b/chrome/browser/tab_contents/test_tab_contents.h
|
| index f0750d73783149d06886b0c4dbd9fb170d9f9726..21bc096fe0f0d22c9b6a6b425bdd8e0cb9439bb1 100644
|
| --- a/chrome/browser/tab_contents/test_tab_contents.h
|
| +++ b/chrome/browser/tab_contents/test_tab_contents.h
|
| @@ -20,7 +20,7 @@ class TestTabContents : public TabContents {
|
| // The render view host factory will be passed on to the
|
| TestTabContents(Profile* profile, SiteInstance* instance);
|
|
|
| - TestRenderViewHost* pending_rvh();
|
| + TestRenderViewHost* pending_rvh() const;
|
|
|
| // State accessor.
|
| bool cross_navigation_pending() {
|
| @@ -62,6 +62,15 @@ class TestTabContents : public TabContents {
|
| // 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;
|
|
|
|
|