| Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| index 5aa882ad4bf2559fd56dd2859430df99dae738f0..5b64c5421dccf753fff9ab785c91818c67ad9c65 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp
|
| @@ -40,20 +40,20 @@ protected:
|
| TEST_F(ContentSecurityPolicyTest, ParseUpgradeInsecureRequestsEnabled)
|
| {
|
| csp->didReceiveHeader("upgrade-insecure-requests", ContentSecurityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceHTTP);
|
| - EXPECT_EQ(SecurityContext::InsecureRequestsUpgrade, csp->insecureRequestsPolicy());
|
| + EXPECT_EQ(SecurityContext::InsecureRequestsUpgrade, csp->getInsecureRequestsPolicy());
|
|
|
| csp->bindToExecutionContext(document.get());
|
| - EXPECT_EQ(SecurityContext::InsecureRequestsUpgrade, document->insecureRequestsPolicy());
|
| + EXPECT_EQ(SecurityContext::InsecureRequestsUpgrade, document->getInsecureRequestsPolicy());
|
| EXPECT_TRUE(document->insecureNavigationsToUpgrade()->contains(secureOrigin->host().impl()->hash()));
|
| }
|
|
|
| TEST_F(ContentSecurityPolicyTest, ParseMonitorInsecureRequestsEnabled)
|
| {
|
| csp->didReceiveHeader("upgrade-insecure-requests", ContentSecurityPolicyHeaderTypeReport, ContentSecurityPolicyHeaderSourceHTTP);
|
| - EXPECT_EQ(SecurityContext::InsecureRequestsDoNotUpgrade, csp->insecureRequestsPolicy());
|
| + EXPECT_EQ(SecurityContext::InsecureRequestsDoNotUpgrade, csp->getInsecureRequestsPolicy());
|
|
|
| csp->bindToExecutionContext(document.get());
|
| - EXPECT_EQ(SecurityContext::InsecureRequestsDoNotUpgrade, document->insecureRequestsPolicy());
|
| + EXPECT_EQ(SecurityContext::InsecureRequestsDoNotUpgrade, document->getInsecureRequestsPolicy());
|
| EXPECT_FALSE(document->insecureNavigationsToUpgrade()->contains(secureOrigin->host().impl()->hash()));
|
| }
|
|
|
| @@ -107,33 +107,33 @@ TEST_F(ContentSecurityPolicyTest, MultipleReferrerDirectives)
|
| {
|
| csp->didReceiveHeader("referrer unsafe-url; referrer origin;", ContentSecurityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceHTTP);
|
| csp->bindToExecutionContext(document.get());
|
| - EXPECT_EQ(ReferrerPolicyOrigin, document->referrerPolicy());
|
| + EXPECT_EQ(ReferrerPolicyOrigin, document->getReferrerPolicy());
|
| }
|
|
|
| TEST_F(ContentSecurityPolicyTest, MultipleReferrerPolicies)
|
| {
|
| csp->didReceiveHeader("referrer unsafe-url;", ContentSecurityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceHTTP);
|
| csp->bindToExecutionContext(document.get());
|
| - EXPECT_EQ(ReferrerPolicyAlways, document->referrerPolicy());
|
| + EXPECT_EQ(ReferrerPolicyAlways, document->getReferrerPolicy());
|
| document->processReferrerPolicy("origin");
|
| - EXPECT_EQ(ReferrerPolicyOrigin, document->referrerPolicy());
|
| + EXPECT_EQ(ReferrerPolicyOrigin, document->getReferrerPolicy());
|
| }
|
|
|
| TEST_F(ContentSecurityPolicyTest, UnknownReferrerDirective)
|
| {
|
| csp->didReceiveHeader("referrer unsafe-url; referrer blahblahblah", ContentSecurityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceHTTP);
|
| csp->bindToExecutionContext(document.get());
|
| - EXPECT_EQ(ReferrerPolicyAlways, document->referrerPolicy());
|
| + EXPECT_EQ(ReferrerPolicyAlways, document->getReferrerPolicy());
|
| document->processReferrerPolicy("origin");
|
| document->processReferrerPolicy("blahblahblah");
|
| - EXPECT_EQ(ReferrerPolicyOrigin, document->referrerPolicy());
|
| + EXPECT_EQ(ReferrerPolicyOrigin, document->getReferrerPolicy());
|
| }
|
|
|
| TEST_F(ContentSecurityPolicyTest, EmptyReferrerDirective)
|
| {
|
| csp->didReceiveHeader("referrer;", ContentSecurityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceHTTP);
|
| csp->bindToExecutionContext(document.get());
|
| - EXPECT_EQ(ReferrerPolicyNever, document->referrerPolicy());
|
| + EXPECT_EQ(ReferrerPolicyNever, document->getReferrerPolicy());
|
| }
|
|
|
| } // namespace blink
|
|
|