Index: content/common/content_security_policy/csp_context_unittest.cc |
diff --git a/content/common/content_security_policy/csp_context_unittest.cc b/content/common/content_security_policy/csp_context_unittest.cc |
index 41bbca409532871832e6ab84c6de007cb687980d..dd508e00b53a6c52befd359112f74b18152e6ca1 100644 |
--- a/content/common/content_security_policy/csp_context_unittest.cc |
+++ b/content/common/content_security_policy/csp_context_unittest.cc |
@@ -45,18 +45,15 @@ |
} // namespace; |
TEST(CSPContextTest, SchemeShouldBypassCSP) { |
+ CSPContextTest context; |
CSPSource source("", "example.com", false, url::PORT_UNSPECIFIED, false, ""); |
- CSPContextTest context; |
- context.AddContentSecurityPolicy( |
- BuildPolicy(CSPDirective::DefaultSrc, {source})); |
- |
- EXPECT_FALSE(context.IsAllowedByCsp(CSPDirective::FrameSrc, |
- GURL("data:text/html,<html></html>"))); |
- |
+ ContentSecurityPolicy policy = |
+ BuildPolicy(CSPDirective::DefaultSrc, {source}); |
+ EXPECT_FALSE(context.Allow({policy}, CSPDirective::FrameSrc, |
+ GURL("data:text/html,<html></html>"))); |
context.AddSchemeToBypassCSP("data"); |
- |
- EXPECT_TRUE(context.IsAllowedByCsp(CSPDirective::FrameSrc, |
- GURL("data:text/html,<html></html>"))); |
+ EXPECT_TRUE(context.Allow({policy}, CSPDirective::FrameSrc, |
+ GURL("data:text/html,<html></html>"))); |
} |
TEST(CSPContextTest, MultiplePolicies) { |
@@ -67,19 +64,21 @@ |
CSPSource source_b("", "b.com", false, url::PORT_UNSPECIFIED, false, ""); |
CSPSource source_c("", "c.com", false, url::PORT_UNSPECIFIED, false, ""); |
- context.AddContentSecurityPolicy( |
- BuildPolicy(CSPDirective::FrameSrc, {source_a, source_b})); |
- context.AddContentSecurityPolicy( |
- BuildPolicy(CSPDirective::FrameSrc, {source_a, source_c})); |
+ ContentSecurityPolicy policy1 = |
+ BuildPolicy(CSPDirective::FrameSrc, {source_a, source_b}); |
+ ContentSecurityPolicy policy2 = |
+ BuildPolicy(CSPDirective::FrameSrc, {source_a, source_c}); |
+ |
+ std::vector<ContentSecurityPolicy> policies = {policy1, policy2}; |
EXPECT_TRUE( |
- context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://a.com"))); |
+ context.Allow(policies, CSPDirective::FrameSrc, GURL("http://a.com"))); |
EXPECT_FALSE( |
- context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://b.com"))); |
+ context.Allow(policies, CSPDirective::FrameSrc, GURL("http://b.com"))); |
EXPECT_FALSE( |
- context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://c.com"))); |
+ context.Allow(policies, CSPDirective::FrameSrc, GURL("http://c.com"))); |
EXPECT_FALSE( |
- context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://d.com"))); |
+ context.Allow(policies, CSPDirective::FrameSrc, GURL("http://d.com"))); |
} |
} // namespace content |