content/browser/web_contents/web_contents_impl_unittest.cc - Issue 2045383002: PlzNavigate: detect when a ServiceWorker is present

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/web_contents_impl_unittest.cc

Issue 2045383002: PlzNavigate: detect when a ServiceWorker is present (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments Created 4 years, 6 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

« no previous file with comments | « content/browser/service_worker/service_worker_request_handler.cc ('k') | content/child/service_worker/service_worker_network_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl_unittest.cc

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

index 4bc08036afd9520bc0d981fc83b67d9ba9c939b9..0c13e0614c8da9b761bb6f0563a567617c12b0d2 100644

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

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

@@ -1337,11 +1337,13 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackOldNavigationIgnored) {

// Go back within the site.

controller().GoBack();

+ contents()->GetMainFrame()->PrepareForCommit();

clamy 2016/06/29 12:15:51 The new check this patch adds in NavigationRequest

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

EXPECT_EQ(entry2, controller().GetPendingEntry());

// Before that commits, go back again.

controller().GoBack();

+ contents()->GetMainFrame()->PrepareForCommit();

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

EXPECT_TRUE(contents()->GetPendingMainFrame());

EXPECT_EQ(entry1, controller().GetPendingEntry());