| Index: third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp
|
| index 59cdec9b1c845a628fc27e694beb801e086831a2..54ba7bbe975c3a48c023db7a1bca15f65ad5a2bf 100644
|
| --- a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp
|
| @@ -89,7 +89,7 @@ TEST_F(FeaturePolicyTest, ParseValidPolicy) {
|
| messages.clear();
|
| std::unique_ptr<FeaturePolicy> policy =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy->setHeaderPolicy(policyString, messages);
|
| + policy->setHeaderPolicy(policyString, &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| }
|
| }
|
| @@ -100,7 +100,7 @@ TEST_F(FeaturePolicyTest, ParseInvalidPolicy) {
|
| messages.clear();
|
| std::unique_ptr<FeaturePolicy> policy =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy->setHeaderPolicy(policyString, messages);
|
| + policy->setHeaderPolicy(policyString, &messages);
|
| EXPECT_NE(0UL, messages.size());
|
| }
|
| }
|
| @@ -175,7 +175,7 @@ TEST_F(FeaturePolicyTest, TestCrossOriginChildCannotEnableFeature) {
|
| createFromParentPolicy(nullptr, m_originA);
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| - policy2->setHeaderPolicy("{\"default-self\": [\"self\"]}", messages);
|
| + policy2->setHeaderPolicy("{\"default-self\": [\"self\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| EXPECT_FALSE(policy2->isFeatureEnabled(kDefaultSelfFeature));
|
| }
|
| @@ -199,7 +199,7 @@ TEST_F(FeaturePolicyTest, TestFrameSelfInheritance) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"self\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"self\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originA);
|
| @@ -233,7 +233,7 @@ TEST_F(FeaturePolicyTest, TestReflexiveFrameSelfInheritance) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"self\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"self\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -262,7 +262,7 @@ TEST_F(FeaturePolicyTest, TestSelectiveFrameInheritance) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"" ORIGIN_B "\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"" ORIGIN_B "\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -284,7 +284,7 @@ TEST_F(FeaturePolicyTest, TestPolicyCanBlockSelf) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-on\": []}", messages);
|
| + policy1->setHeaderPolicy("{\"default-on\": []}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| EXPECT_FALSE(policy1->isFeatureEnabled(kDefaultOnFeature));
|
| }
|
| @@ -302,7 +302,7 @@ TEST_F(FeaturePolicyTest, TestParentPolicyBlocksSameOriginChildPolicy) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-on\": []}", messages);
|
| + policy1->setHeaderPolicy("{\"default-on\": []}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originA);
|
| @@ -324,7 +324,7 @@ TEST_F(FeaturePolicyTest, TestChildPolicyCanBlockSelf) {
|
| createFromParentPolicy(nullptr, m_originA);
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| - policy2->setHeaderPolicy("{\"default-on\": []}", messages);
|
| + policy2->setHeaderPolicy("{\"default-on\": []}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| EXPECT_FALSE(policy2->isFeatureEnabled(kDefaultOnFeature));
|
| }
|
| @@ -349,7 +349,7 @@ TEST_F(FeaturePolicyTest, TestChildPolicyCanBlockChildren) {
|
| createFromParentPolicy(nullptr, m_originA);
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| - policy2->setHeaderPolicy("{\"default-on\": [\"self\"]}", messages);
|
| + policy2->setHeaderPolicy("{\"default-on\": [\"self\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy3 =
|
| createFromParentPolicy(policy2.get(), m_originC);
|
| @@ -370,7 +370,7 @@ TEST_F(FeaturePolicyTest, TestParentPolicyBlocksCrossOriginChildPolicy) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-on\": []}", messages);
|
| + policy1->setHeaderPolicy("{\"default-on\": []}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -394,7 +394,7 @@ TEST_F(FeaturePolicyTest, TestEnableForAllOrigins) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"*\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"*\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -422,7 +422,7 @@ TEST_F(FeaturePolicyTest, TestDefaultOnEnablesForAllAncestors) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-on\": [\"" ORIGIN_B "\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-on\": [\"" ORIGIN_B "\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -453,7 +453,7 @@ TEST_F(FeaturePolicyTest, TestDefaultSelfRespectsSameOriginEmbedding) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"" ORIGIN_B "\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"" ORIGIN_B "\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -484,16 +484,16 @@ TEST_F(FeaturePolicyTest, TestDefaultOffMustBeDelegatedToAllCrossOriginFrames) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-off\": [\"" ORIGIN_B "\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-off\": [\"" ORIGIN_B "\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| - policy2->setHeaderPolicy("{\"default-off\": [\"self\"]}", messages);
|
| + policy2->setHeaderPolicy("{\"default-off\": [\"self\"]}", &messages);
|
| std::unique_ptr<FeaturePolicy> policy3 =
|
| createFromParentPolicy(policy2.get(), m_originB);
|
| std::unique_ptr<FeaturePolicy> policy4 =
|
| createFromParentPolicy(policy2.get(), m_originC);
|
| - policy4->setHeaderPolicy("{\"default-off\": [\"self\"]}", messages);
|
| + policy4->setHeaderPolicy("{\"default-off\": [\"self\"]}", &messages);
|
| EXPECT_FALSE(policy1->isFeatureEnabled(kDefaultOffFeature));
|
| EXPECT_TRUE(policy2->isFeatureEnabled(kDefaultOffFeature));
|
| EXPECT_FALSE(policy3->isFeatureEnabled(kDefaultOffFeature));
|
| @@ -517,11 +517,11 @@ TEST_F(FeaturePolicyTest, TestReenableForAllOrigins) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"*\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"*\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| - policy2->setHeaderPolicy("{\"default-self\": [\"*\"]}", messages);
|
| + policy2->setHeaderPolicy("{\"default-self\": [\"*\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy3 =
|
| createFromParentPolicy(policy2.get(), m_originA);
|
| @@ -547,11 +547,11 @@ TEST_F(FeaturePolicyTest, TestBlockedFrameCannotReenable) {
|
| Vector<String> messages;
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| - policy1->setHeaderPolicy("{\"default-self\": [\"self\"]}", messages);
|
| + policy1->setHeaderPolicy("{\"default-self\": [\"self\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| - policy2->setHeaderPolicy("{\"default-self\": [\"*\"]}", messages);
|
| + policy2->setHeaderPolicy("{\"default-self\": [\"*\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy3 =
|
| createFromParentPolicy(policy2.get(), m_originA);
|
| @@ -581,12 +581,12 @@ TEST_F(FeaturePolicyTest, TestEnabledFrameCanDelegate) {
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| policy1->setHeaderPolicy("{\"default-self\": [\"self\", \"" ORIGIN_B "\"]}",
|
| - messages);
|
| + &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| policy2->setHeaderPolicy("{\"default-self\": [\"self\", \"" ORIGIN_C "\"]}",
|
| - messages);
|
| + &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy3 =
|
| createFromParentPolicy(policy2.get(), m_originC);
|
| @@ -613,7 +613,7 @@ TEST_F(FeaturePolicyTest, TestEnabledFrameCanDelegateByDefault) {
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| policy1->setHeaderPolicy("{\"default-on\": [\"self\", \"" ORIGIN_B "\"]}",
|
| - messages);
|
| + &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -646,7 +646,7 @@ TEST_F(FeaturePolicyTest, TestNonNestedFeaturesDontDelegateByDefault) {
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| policy1->setHeaderPolicy("{\"default-self\": [\"self\", \"" ORIGIN_B "\"]}",
|
| - messages);
|
| + &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| @@ -682,12 +682,12 @@ TEST_F(FeaturePolicyTest, TestFeaturesAreIndependent) {
|
| createFromParentPolicy(nullptr, m_originA);
|
| policy1->setHeaderPolicy("{\"default-self\": [\"self\", \"" ORIGIN_B
|
| "\"], \"default-on\": [\"self\"]}",
|
| - messages);
|
| + &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy2 =
|
| createFromParentPolicy(policy1.get(), m_originB);
|
| policy2->setHeaderPolicy(
|
| - "{\"default-self\": [\"*\"], \"default-on\": [\"*\"]}", messages);
|
| + "{\"default-self\": [\"*\"], \"default-on\": [\"*\"]}", &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| std::unique_ptr<FeaturePolicy> policy3 =
|
| createFromParentPolicy(policy2.get(), m_originC);
|
| @@ -710,7 +710,7 @@ TEST_F(FeaturePolicyTest, TestFeatureEnabledForOrigin) {
|
| std::unique_ptr<FeaturePolicy> policy1 =
|
| createFromParentPolicy(nullptr, m_originA);
|
| policy1->setHeaderPolicy("{\"default-off\": [\"self\", \"" ORIGIN_B "\"]}",
|
| - messages);
|
| + &messages);
|
| EXPECT_EQ(0UL, messages.size());
|
| EXPECT_TRUE(
|
| policy1->isFeatureEnabledForOrigin(kDefaultOffFeature, *m_originA));
|
|
|