Enable Feature Policy without experimental features or fullscreen

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/feature_policy/FeaturePolicy.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/json/JSONValues.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/weborigin/SecurityOrigin.h"
@@ skipping 94 matching lines @@
   Vector<WebParsedFeaturePolicyDeclaration> whitelists;
   bool override_payment = false;
   bool override_fullscreen = false;
   for (const WebFeaturePolicyFeature feature : features) {
     // Container policy should override "allowfullscreen" and
     // "allowpaymentrequest" policies.
     if (feature == WebFeaturePolicyFeature::kPayment)
       override_payment = true;
     if (feature == WebFeaturePolicyFeature::kFullscreen)
       override_fullscreen = true;
-
     WebParsedFeaturePolicyDeclaration whitelist;
     whitelist.feature = feature;
     whitelist.origins = Vector<WebSecurityOrigin>(1UL, {origin});
     whitelists.push_back(whitelist);
   }
   // If allowfullscreen attribute is present and no fullscreen policy is set,
   // enable the feature for all origins; similarly for allowpaymentrequest.
   if (allowpayment && !override_payment)
     AddAllowFeatureToList(WebFeaturePolicyFeature::kPayment, whitelists);
   if (allowfullscreen && !override_fullscreen)
     AddAllowFeatureToList(WebFeaturePolicyFeature::kFullscreen, whitelists);
 
   return whitelists;
 }
 
 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);
       default_feature_name_map.Set("camera", WebFeaturePolicyFeature::kCamera);
       default_feature_name_map.Set("encrypted-media",
                                    WebFeaturePolicyFeature::kEme);
       default_feature_name_map.Set("microphone",
                                    WebFeaturePolicyFeature::kMicrophone);
       default_feature_name_map.Set("speaker",
                                    WebFeaturePolicyFeature::kSpeaker);
@@ skipping 14 matching lines @@
                                    WebFeaturePolicyFeature::kSyncScript);
       default_feature_name_map.Set("sync-xhr",
                                    WebFeaturePolicyFeature::kSyncXHR);
       default_feature_name_map.Set("webrtc", WebFeaturePolicyFeature::kWebRTC);
     }
   }
   return default_feature_name_map;
 }
 
 }  // namespace blink