Update list of Feature Policy features

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 53be7b881329371c9bc6fdb63ba40c3d1c655b50..697efa78690889b4a1055a47eaa95871155b0601 100644
--- a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
+++ b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
@@ -107,34 +107,29 @@ const FeatureNameMap& GetDefaultFeatureNameMap() {
                                  WebFeaturePolicyFeature::kFullscreen);
     default_feature_name_map.Set("payment", WebFeaturePolicyFeature::kPayment);
     default_feature_name_map.Set("usb", WebFeaturePolicyFeature::kUsb);
+    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("geolocation",
+                                 WebFeaturePolicyFeature::kGeolocation);
+    default_feature_name_map.Set("midi", WebFeaturePolicyFeature::kMidiFeature);
     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);
+

[iclelland, 2017/06/22 13:06:09]

nit: remove blank line

[raymes, 2017/06/26 05:59:05]

Done.

       default_feature_name_map.Set("cookie",
                                    WebFeaturePolicyFeature::kDocumentCookie);
       default_feature_name_map.Set("domain",
                                    WebFeaturePolicyFeature::kDocumentDomain);
       default_feature_name_map.Set("docwrite",
                                    WebFeaturePolicyFeature::kDocumentWrite);
-      default_feature_name_map.Set("geolocation",
-                                   WebFeaturePolicyFeature::kGeolocation);
-      default_feature_name_map.Set("midi",
-                                   WebFeaturePolicyFeature::kMidiFeature);
-      default_feature_name_map.Set("notifications",
-                                   WebFeaturePolicyFeature::kNotifications);
-      default_feature_name_map.Set("push", WebFeaturePolicyFeature::kPush);
       default_feature_name_map.Set("sync-script",
                                    WebFeaturePolicyFeature::kSyncScript);
       default_feature_name_map.Set("sync-xhr",
                                    WebFeaturePolicyFeature::kSyncXHR);
-      default_feature_name_map.Set("webrtc", WebFeaturePolicyFeature::kWebRTC);
     }
   }
   return default_feature_name_map;