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

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

Index: third_party/WebKit/Source/bindings/core/v8/ConditionalFeaturesForCore.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeaturesForCore.h b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeaturesForCore.h
index dc61f1bfa703b2966248f03806ed79a0589227ec..bd2e9c2a4bd9dc53c95048a35dc9bb175e5fd2e8 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeaturesForCore.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeaturesForCore.h
@@ -7,11 +7,11 @@
 
 #include <v8.h>
 #include "core/CoreExport.h"
-#include "platform/feature_policy/FeaturePolicy.h"
+#include "public/platform/WebFeaturePolicy.h"
 
 namespace blink {
 
-class LocalFrame;
+class Frame;
 class ScriptState;
 
 // Installs all of the conditionally enabled V8 bindings on the Window object.
@@ -20,8 +20,9 @@ class ScriptState;
 // when the V8 context is reused (i.e., after navigation)
 CORE_EXPORT void installConditionalFeaturesOnWindow(const ScriptState*);
 
-CORE_EXPORT bool isFeatureEnabledInFrame(const FeaturePolicy::Feature&,
-                                         const LocalFrame*);
+// Tests whether the feature-policy controlled feature is enabled by policy in
+// the given frame.
+CORE_EXPORT bool isFeatureEnabledInFrame(WebFeaturePolicyFeature, const Frame*);
 
 CORE_EXPORT void registerInstallConditionalFeaturesForCore();