| 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 c2feabfee254fbe993c014e7c3eb3b7caae02786..31f15eb67493edb2f0a02d4668d40302ece6b921 100644
|
| --- a/content/browser/tab_contents/test_tab_contents.cc
|
| +++ b/content/browser/tab_contents/test_tab_contents.cc
|
| @@ -38,12 +38,12 @@ TestTabContents::TestTabContents(content::BrowserContext* browser_context,
|
| TestTabContents::~TestTabContents() {
|
| }
|
|
|
| -RenderViewHost* TestTabContents::pending_rvh() const {
|
| +RenderViewHost* TestTabContents::GetPendingRenderViewHost() const {
|
| return render_manager_.pending_render_view_host_;
|
| }
|
|
|
| TestRenderViewHost* TestTabContents::pending_test_rvh() const {
|
| - return static_cast<TestRenderViewHost*>(pending_rvh());
|
| + return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost());
|
| }
|
|
|
| void TestTabContents::TestDidNavigate(RenderViewHost* render_view_host,
|
| @@ -122,7 +122,8 @@ void TestTabContents::CommitPendingNavigation() {
|
| // navigate.
|
| ProceedWithCrossSiteNavigation();
|
| RenderViewHost* old_rvh = render_manager_.current_host();
|
| - TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(pending_rvh());
|
| + TestRenderViewHost* rvh =
|
| + static_cast<TestRenderViewHost*>(GetPendingRenderViewHost());
|
| if (!rvh)
|
| rvh = static_cast<TestRenderViewHost*>(old_rvh);
|
|
|
| @@ -147,7 +148,7 @@ int TestTabContents::GetNumberOfFocusCalls() {
|
| }
|
|
|
| void TestTabContents::ProceedWithCrossSiteNavigation() {
|
| - if (!pending_rvh())
|
| + if (!GetPendingRenderViewHost())
|
| return;
|
| TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(
|
| render_manager_.current_host());
|
|
|