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

third_party/WebKit/Source/bindings/core/v8/ConditionalFeaturesForCore.cpp

 // Copyright 2017 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 "bindings/core/v8/ConditionalFeaturesForCore.h"
 
 #include "bindings/core/v8/ConditionalFeatures.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Document.h"
 #include "bindings/core/v8/V8HTMLLinkElement.h"
 #include "bindings/core/v8/V8Navigator.h"
 #include "bindings/core/v8/V8Window.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/frame/LocalFrame.h"
+#include "core/frame/Frame.h"
 #include "core/origin_trials/OriginTrials.h"
 
 namespace blink {
 
 namespace {
 InstallConditionalFeaturesFunction s_oldInstallConditionalFeaturesFunction =
     nullptr;
 InstallPendingConditionalFeatureFunction
     s_oldInstallPendingConditionalFeatureFunction = nullptr;
 }
@@ skipping 62 matching lines @@
 void installConditionalFeaturesOnWindow(const ScriptState* scriptState) {
   DCHECK(scriptState);
   DCHECK(scriptState->context() == scriptState->isolate()->GetCurrentContext());
   DCHECK(scriptState->perContextData());
   DCHECK(scriptState->world().isMainWorld());
   installConditionalFeatures(&V8Window::wrapperTypeInfo, scriptState,
                              v8::Local<v8::Object>(),
                              v8::Local<v8::Function>());
 }
 
-bool isFeatureEnabledInFrame(const FeaturePolicy::Feature& feature,
-                             const LocalFrame* frame) {
-  // If there is no frame, or if feature policy is disabled, use defaults.
-  bool enabledByDefault =
-      (feature.defaultPolicy == FeaturePolicy::FeatureDefault::EnableForAll ||
-       (feature.defaultPolicy == FeaturePolicy::FeatureDefault::EnableForSelf &&
-        !frame->isCrossOriginSubframe()));
-  if (!RuntimeEnabledFeatures::featurePolicyEnabled() || !frame)
-    return enabledByDefault;
-  FeaturePolicy* featurePolicy = frame->securityContext()->getFeaturePolicy();
+bool isFeatureEnabledInFrame(WebFeaturePolicyFeature feature,
+                             const Frame* frame) {
+  DCHECK(frame);
+  WebFeaturePolicy* featurePolicy =
+      frame->securityContext()->getFeaturePolicy();
   // The policy should always be initialized before checking it to ensure we
   // properly inherit the parent policy.
   DCHECK(featurePolicy);
 
   // Otherwise, check policy.
-  return featurePolicy->isFeatureEnabled(feature);
+  return featurePolicy->IsFeatureEnabled(feature);
 }
 
 void registerInstallConditionalFeaturesForCore() {
   s_oldInstallConditionalFeaturesFunction =
       setInstallConditionalFeaturesFunction(&installConditionalFeaturesCore);
   s_oldInstallPendingConditionalFeatureFunction =
       setInstallPendingConditionalFeatureFunction(
           &installPendingConditionalFeatureCore);
 }
 
 }  // namespace blink