Enable Feature Policy without experimental features or fullscreen

third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp

Index: third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
diff --git a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
index f89c965b35075a0057e00fe885d3e977f2c26074..ea002291e5040b42898fbad9212b02b9d1baefe0 100644
--- a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
+++ b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
@@ -112,7 +112,6 @@ WebParsedFeaturePolicy GetContainerPolicyFromAllowedFeatures(
       override_payment = true;
     if (feature == WebFeaturePolicyFeature::kFullscreen)
       override_fullscreen = true;
-
     WebParsedFeaturePolicyDeclaration whitelist;
     whitelist.feature = feature;
     whitelist.origins = Vector<WebSecurityOrigin>(1UL, {origin});
@@ -131,9 +130,9 @@ WebParsedFeaturePolicy GetContainerPolicyFromAllowedFeatures(
 const FeatureNameMap& GetDefaultFeatureNameMap() {
   DEFINE_STATIC_LOCAL(FeatureNameMap, default_feature_name_map, ());
   if (default_feature_name_map.IsEmpty()) {
+    default_feature_name_map.Set("payment", WebFeaturePolicyFeature::kPayment);

[iclelland, 2017/05/09 17:58:45]

This change looks unintentional; I'd prefer to not see it show up in the git
revision log, since nothing significant actually changed in this function.

[lunalu1, 2017/05/09 19:07:31]

Done.

     default_feature_name_map.Set("fullscreen",
                                  WebFeaturePolicyFeature::kFullscreen);
-    default_feature_name_map.Set("payment", WebFeaturePolicyFeature::kPayment);
     if (RuntimeEnabledFeatures::featurePolicyExperimentalFeaturesEnabled()) {
       default_feature_name_map.Set("vibrate",
                                    WebFeaturePolicyFeature::kVibrate);