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 DCHECK + rebase 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/render_frame_host_manager_unittest.cc ('K') | « content/browser/renderer_host/render_view_host_unittest.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | content/browser/web_contents/web_contents_impl_unittest.cc » ('J')
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 3182ca579fd46cec8e0bd1a6e056e6736f800b91..22dd28a0c802f687f2b9af9530e4ce8f83ed4bd3 100644

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

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

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

// image_delegate_.

GetOverlay()->OnOverscrollCompleting();

if (window) {

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

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

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

} else {

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

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

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

}

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

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

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

GetOverlay()->OnOverscrollCancelled();

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

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

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

}

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

GetOverlay()->OnOverscrollCancelled();

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

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

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

contents()->CommitPendingNavigation();

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

}