| 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 fc6bf5710b1b613c42b55dd38a72057e0412f298..2783363612595642129a876dd6dc6fedfa92542d 100644
|
| --- a/content/browser/tab_contents/test_tab_contents.cc
|
| +++ b/content/browser/tab_contents/test_tab_contents.cc
|
| @@ -38,9 +38,12 @@ TestTabContents::TestTabContents(content::BrowserContext* browser_context,
|
| TestTabContents::~TestTabContents() {
|
| }
|
|
|
| -TestRenderViewHost* TestTabContents::pending_rvh() const {
|
| - return static_cast<TestRenderViewHost*>(
|
| - render_manager_.pending_render_view_host_);
|
| +RenderViewHost* TestTabContents::pending_rvh() const {
|
| + return render_manager_.pending_render_view_host_;
|
| +}
|
| +
|
| +TestRenderViewHost* TestTabContents::pending_test_rvh() const {
|
| + return static_cast<TestRenderViewHost*>(pending_rvh());
|
| }
|
|
|
| void TestTabContents::TestDidNavigate(RenderViewHost* render_view_host,
|
| @@ -115,7 +118,7 @@ void TestTabContents::CommitPendingNavigation() {
|
| // navigate.
|
| ProceedWithCrossSiteNavigation();
|
| RenderViewHost* old_rvh = render_manager_.current_host();
|
| - TestRenderViewHost* rvh = pending_rvh();
|
| + TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(pending_rvh());
|
| if (!rvh)
|
| rvh = static_cast<TestRenderViewHost*>(old_rvh);
|
|
|
|
|