third_party/WebKit/Source/core/frame/SubresourceIntegrityTest.cpp - Issue 1655413002: Merge updateSecurityOrigin() and setSecurityOrigin().

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/frame/SubresourceIntegrityTest.cpp

Issue 1655413002: Merge updateSecurityOrigin() and setSecurityOrigin(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/dom/SecurityContext.cpp ('k') | third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/SubresourceIntegrityTest.cpp

diff --git a/third_party/WebKit/Source/core/frame/SubresourceIntegrityTest.cpp b/third_party/WebKit/Source/core/frame/SubresourceIntegrityTest.cpp

index 02d673de5d4e5430d421df5f96c9e07a0b194b97..3c1f37ede5a5929a53c5cdf43f10382489182275 100644

--- a/third_party/WebKit/Source/core/frame/SubresourceIntegrityTest.cpp

+++ b/third_party/WebKit/Source/core/frame/SubresourceIntegrityTest.cpp

@@ -386,7 +386,7 @@ TEST_F(SubresourceIntegrityTest, ParsingBase64)

TEST_F(SubresourceIntegrityTest, CheckSubresourceIntegrityInSecureOrigin)

{

- document->updateSecurityOrigin(secureOrigin->isolatedCopy());

+ document->setSecurityOrigin(secureOrigin->isolatedCopy());

// Verify basic sha256, sha384, and sha512 integrity checks.

expectIntegrity(kSha256Integrity, kBasicScript, strlen(kBasicScript), secureURL, secureURL);

@@ -424,7 +424,7 @@ TEST_F(SubresourceIntegrityTest, CheckSubresourceIntegrityInInsecureOrigin)

{

// The same checks as CheckSubresourceIntegrityInSecureOrigin should pass

// here, with the expection of the NoCors check at the end.

- document->updateSecurityOrigin(insecureOrigin->isolatedCopy());

+ document->setSecurityOrigin(insecureOrigin->isolatedCopy());

expectIntegrity(kSha256Integrity, kBasicScript, strlen(kBasicScript), secureURL, insecureURL);

expectIntegrity(kSha256IntegrityLenientSyntax, kBasicScript, strlen(kBasicScript), secureURL, insecureURL);