third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp - Issue 2109633002: Executed HTTPS upgrade before notifying the start of the provisional load.

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: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

Issue 2109633002: Executed HTTPS upgrade before notifying the start of the provisional load. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Simplified cross site URL code. Created 4 years, 5 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 | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

index 8e8aa81b628772857b19df076b07cbf2a646fc14..c9e1ebff4ebb10814888e5ae69a706eac900f4eb 100644

--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

@@ -186,7 +186,7 @@ protected:

fetchRequest.mutableResourceRequest().setRequestContext(requestContext);

fetchRequest.mutableResourceRequest().setFrameType(frameType);

- fetchContext->upgradeInsecureRequest(fetchRequest);

+ fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());

EXPECT_STREQ(expectedURL.getString().utf8().data(), fetchRequest.resourceRequest().url().getString().utf8().data());

EXPECT_EQ(expectedURL.protocol(), fetchRequest.resourceRequest().url().protocol());

@@ -204,10 +204,16 @@ protected:

fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextScript);

fetchRequest.mutableResourceRequest().setFrameType(frameType);

- fetchContext->upgradeInsecureRequest(fetchRequest);

+ fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());

EXPECT_STREQ(shouldPrefer ? "1" : "",

fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests).utf8().data());

+ // Calling upgradeInsecureRequest more than once shouldn't affect the header.

+ if (shouldPrefer) {

+ fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());

+ EXPECT_STREQ("1", fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests).utf8().data());

+ }

}

RefPtr<SecurityOrigin> exampleOrigin;