content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc - Issue 1048463004: PlzNavigate: track pending commits

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/aura/overscroll_navigation_overlay_unittest.cc

Issue 1048463004: PlzNavigate: track pending commits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed other occurences of main_test_rfh Created 5 years, 8 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:

View side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/navigation_controller_impl_unittest.cc ('K') | « content/browser/renderer_host/render_view_host_unittest.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

index 4eda449e57f2587099b6f39f0656ef3958da3b7d..8b6c78424b9ed7747849f6857cb2b655712a38b9 100644

--- a/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

+++ b/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

@@ -103,10 +103,10 @@ class OverscrollNavigationOverlayTest : public RenderViewHostImplTestHarness {

GetOverlay()->OnOverscrollCompleting();

main_test_rfh()->PrepareForCommit();

if (window) {

- EXPECT_TRUE(contents()->cross_navigation_pending());

+ EXPECT_TRUE(contents()->CrossProcessNavigationPending());

EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);

} else {

- EXPECT_FALSE(contents()->cross_navigation_pending());

+ EXPECT_FALSE(contents()->CrossProcessNavigationPending());

EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);

}

window->SetBounds(gfx::Rect(root_window()->bounds().size()));

@@ -237,7 +237,7 @@ TEST_F(OverscrollNavigationOverlayTest, CancelNavigation) {

EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);

GetOverlay()->OnOverscrollCancelled();

- EXPECT_FALSE(contents()->cross_navigation_pending());

+ EXPECT_FALSE(contents()->CrossProcessNavigationPending());

EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);

}

@@ -252,7 +252,7 @@ TEST_F(OverscrollNavigationOverlayTest, CancelAfterSuccessfulNavigation) {

GetOverlay()->OnOverscrollCancelled();

EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);

- EXPECT_TRUE(contents()->cross_navigation_pending());

+ EXPECT_TRUE(contents()->CrossProcessNavigationPending());

main_test_rfh()->SendNavigate(

1, contents()->GetController().GetPendingEntry()->GetURL());

EXPECT_EQ(contents()->GetURL(), third());