Update list of Feature Policy features

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 89 matching lines @@
   }
 }
 
 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);
     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;
 }
 
 }  // namespace blink