content/browser/web_contents/render_view_host_manager_unittest.cc - Issue 23022006: Remove GetActiveEntry usage from content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/render_view_host_manager_unittest.cc

Issue 23022006: Remove GetActiveEntry usage from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing android compile break. Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/web_contents/render_view_host_manager_unittest.cc

diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc

index d8837ebc5ccf330bc9035b5c67dc6ef0411e6d55..070c692871b392586236a3bc5e9618428d0aacf0 100644

--- a/content/browser/web_contents/render_view_host_manager_unittest.cc

+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc

@@ -950,7 +950,8 @@ TEST_F(RenderViewHostManagerTest, PageDoesBackAndReload) {

EXPECT_EQ(evil_rvh, contents()->GetRenderManagerForTesting()->current_host());

// Also we should not have a pending navigation entry.

- NavigationEntry* entry = contents()->GetController().GetActiveEntry();

+ EXPECT_TRUE(contents()->GetController().GetPendingEntry() == NULL);

+ NavigationEntry* entry = contents()->GetController().GetVisibleEntry();

ASSERT_TRUE(entry != NULL);

EXPECT_EQ(kUrl2, entry->GetURL());

}