Make content::FeaturePolicy implement WebFeaturePolicy, and use it in blink code

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
index 526f74e012afc41f47604f1cb3a1970a470def45..c0de6d55b8f18b0621e3bc6e8d67a6b2f2d3889e 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 #include <utility>
-#include "bindings/core/v8/ConditionalFeatures.h"
+#include "bindings/core/v8/ConditionalFeaturesForCore.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ -598,8 +598,7 @@ bool allowedToUsePaymentRequest(const Frame* frame) {
 
   // 1. If FP, by itself, enables paymentrequest in this document, then
   // paymentrequest is allowed.
-  if (frame->securityContext()->getFeaturePolicy()->isFeatureEnabled(
-          kPaymentFeature)) {
+  if (isFeatureEnabledInFrame(WebFeaturePolicyFeature::Payment, frame)) {
     return true;
   }