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 ceee1a93eed7c29962334b7db2da6e45664abbb3..3457b8a374d7d37e4dfe9a08da560e7db03cf9e0 100644 |
--- a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp |
+++ b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicyTest.cpp |
@@ -17,12 +17,12 @@ namespace blink { |
namespace { |
const char* const kValidPolicies[] = { |
- "{\"vibrate\": []}", |
- "{\"vibrate\": [\"self\"]}", |
- "{\"vibrate\": [\"*\"]}", |
- "{\"vibrate\": [\"" ORIGIN_A "\"]}", |
- "{\"vibrate\": [\"" ORIGIN_B "\"]}", |
- "{\"vibrate\": [\"" ORIGIN_A "\", \"" ORIGIN_B "\"]}", |
+ "{\"payment\": []}", |
+ "{\"payment\": [\"self\"]}", |
+ "{\"payment\": [\"*\"]}", |
+ "{\"payment\": [\"" ORIGIN_A "\"]}", |
+ "{\"payment\": [\"" ORIGIN_B "\"]}", |
+ "{\"payment\": [\"" ORIGIN_A "\", \"" ORIGIN_B "\"]}", |
"{\"fullscreen\": [\"" ORIGIN_A "\"], \"payment\": [\"self\"]}", |
"{\"fullscreen\": [\"" ORIGIN_A "\"]}, {\"payment\": [\"self\"]}"}; |
@@ -31,8 +31,8 @@ const char* g_k_invalid_policies[] = { |
"\"Not a JSON object\"", |
"[\"Also\", \"Not a JSON object\"]", |
"1.0", |
- "{\"vibrate\": \"Not a JSON array\"}", |
- "{\"vibrate\": [\"*\"], \"payment\": \"Not a JSON array\"}"}; |
+ "{\"payment\": \"Not a JSON array\"}", |
+ "{\"payment\": [\"*\"], \"payment\": \"Not a JSON array\"}"}; |
} // namespace |
@@ -75,10 +75,10 @@ TEST_F(FeaturePolicyTest, PolicyParsedCorrectly) { |
EXPECT_EQ(0UL, parsed_policy.size()); |
// Simple policy with "self". |
- parsed_policy = ParseFeaturePolicy("{\"vibrate\": [\"self\"]}", |
+ parsed_policy = ParseFeaturePolicy("{\"payment\": [\"self\"]}", |
origin_a_.Get(), &messages); |
EXPECT_EQ(1UL, parsed_policy.size()); |
- EXPECT_EQ(WebFeaturePolicyFeature::kVibrate, parsed_policy[0].feature); |
+ EXPECT_EQ(WebFeaturePolicyFeature::kPayment, parsed_policy[0].feature); |
EXPECT_FALSE(parsed_policy[0].matches_all_origins); |
EXPECT_EQ(1UL, parsed_policy[0].origins.size()); |
EXPECT_TRUE(origin_a_->IsSameSchemeHostPortAndSuborigin( |
@@ -86,20 +86,20 @@ TEST_F(FeaturePolicyTest, PolicyParsedCorrectly) { |
// Simple policy with *. |
parsed_policy = |
- ParseFeaturePolicy("{\"vibrate\": [\"*\"]}", origin_a_.Get(), &messages); |
+ ParseFeaturePolicy("{\"payment\": [\"*\"]}", origin_a_.Get(), &messages); |
EXPECT_EQ(1UL, parsed_policy.size()); |
- EXPECT_EQ(WebFeaturePolicyFeature::kVibrate, parsed_policy[0].feature); |
+ EXPECT_EQ(WebFeaturePolicyFeature::kPayment, parsed_policy[0].feature); |
EXPECT_TRUE(parsed_policy[0].matches_all_origins); |
EXPECT_EQ(0UL, parsed_policy[0].origins.size()); |
// Complicated policy. |
parsed_policy = ParseFeaturePolicy( |
- "{\"vibrate\": [\"*\"], " |
+ "{\"payment\": [\"*\"], " |
"\"fullscreen\": [\"https://example.net\", \"https://example.org\"], " |
"\"payment\": [\"self\"]}", |
origin_a_.Get(), &messages); |
EXPECT_EQ(3UL, parsed_policy.size()); |
- EXPECT_EQ(WebFeaturePolicyFeature::kVibrate, parsed_policy[0].feature); |
+ EXPECT_EQ(WebFeaturePolicyFeature::kPayment, parsed_policy[0].feature); |
EXPECT_TRUE(parsed_policy[0].matches_all_origins); |
EXPECT_EQ(0UL, parsed_policy[0].origins.size()); |
EXPECT_EQ(WebFeaturePolicyFeature::kFullscreen, parsed_policy[1].feature); |
@@ -127,11 +127,11 @@ TEST_F(FeaturePolicyTest, ParseContainerPolicy) { |
WebParsedFeaturePolicy container_policy = |
GetContainerPolicyFromAllowedFeatures( |
std::vector<WebFeaturePolicyFeature>( |
- {WebFeaturePolicyFeature::kVibrate, |
+ {WebFeaturePolicyFeature::kPayment, |
WebFeaturePolicyFeature::kPayment}), |
origin_a_.Get()); |
EXPECT_EQ(2UL, container_policy.size()); |
- EXPECT_EQ(WebFeaturePolicyFeature::kVibrate, container_policy[0].feature); |
+ EXPECT_EQ(WebFeaturePolicyFeature::kPayment, container_policy[0].feature); |
EXPECT_FALSE(container_policy[0].matches_all_origins); |
EXPECT_EQ(1UL, container_policy[0].origins.size()); |
EXPECT_TRUE(origin_a_->IsSameSchemeHostPortAndSuborigin( |