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 110 matching lines @@
   // 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;
 }
 
+bool IsSupportedInFeaturePolicy(WebFeaturePolicyFeature feature) {
+  switch (feature) {
+    // TODO(lunalu): Re-enabled fullscreen in feature policy once tests have
+    // been updated.
+    // crbug.com/666761
+    case WebFeaturePolicyFeature::kFullscreen:
+      return false;
+    case WebFeaturePolicyFeature::kPayment:
+      return true;
+    case WebFeaturePolicyFeature::kVibrate:
+      return RuntimeEnabledFeatures::featurePolicyExperimentalFeaturesEnabled();
+    default:
+      return false;
+  }
+}
+
 const FeatureNameMap& GetDefaultFeatureNameMap() {
   DEFINE_STATIC_LOCAL(FeatureNameMap, default_feature_name_map, ());
   if (default_feature_name_map.IsEmpty()) {
-    default_feature_name_map.Set("fullscreen",
-                                 WebFeaturePolicyFeature::kFullscreen);
     default_feature_name_map.Set("payment", WebFeaturePolicyFeature::kPayment);
     if (RuntimeEnabledFeatures::featurePolicyExperimentalFeaturesEnabled()) {
+      default_feature_name_map.Set("fullscreen",
+                                   WebFeaturePolicyFeature::kFullscreen);
       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);
       default_feature_name_map.Set("cookie",
@@ skipping 13 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