Move Feature Policy test to Frame

third_party/WebKit/Source/modules/payments/PaymentRequest.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 "modules/payments/PaymentRequest.h"
 
 #include <stddef.h>
 #include <utility>
-#include "bindings/core/v8/ConditionalFeaturesForCore.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8StringResource.h"
 #include "bindings/modules/v8/V8AndroidPayMethodData.h"
 #include "bindings/modules/v8/V8BasicCardRequest.h"
 #include "bindings/modules/v8/V8PaymentDetails.h"
 #include "core/EventTypeNames.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
@@ skipping 571 matching lines @@
     return false;
   }
 
   // If Feature Policy is enabled. then we need this hack to support it, until
   // we have proper support for <iframe allowfullscreen> in FP:
   // TODO(lunalu): clean up the code once FP iframe is supported
   // crbug.com/682280
 
   // 1. If FP, by itself, enables paymentrequest in this document, then
   // paymentrequest is allowed.
-  if (isFeatureEnabledInFrame(WebFeaturePolicyFeature::Payment, frame)) {
+  if (frame->isFeatureEnabled(WebFeaturePolicyFeature::Payment)) {
     return true;
   }
 
   // 2. Otherwise, if the embedding frame's document is allowed to use
   // paymentrequest (either through FP or otherwise), and either:
   //   a) this is a same-origin embedded document, or
   //   b) this document's iframe has the allowpayment attribute set,
   // then paymentrequest is allowed.
   if (!frame->isMainFrame()) {
     if (allowedToUsePaymentRequest(frame->tree().parent())) {
@@ skipping 451 matching lines @@
   m_completeResolver.clear();
   m_showResolver.clear();
   m_abortResolver.clear();
   m_canMakePaymentResolver.clear();
   if (m_clientBinding.is_bound())
     m_clientBinding.Close();
   m_paymentProvider.reset();
 }
 
 }  // namespace blink