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

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

Index: third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h
index 10dc7a0cb4c89e7c63546beb1687885e339f0f91..85e2fc38be61a962174488fd7bd6365db99c12a4 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h
@@ -5,14 +5,14 @@
 #ifndef ConditionalFeatures_h
 #define ConditionalFeatures_h
 
+#include <v8.h>
 #include "core/CoreExport.h"
-#include "platform/feature_policy/FeaturePolicy.h"
+#include "public/platform/WebFeaturePolicy.h"
 #include "wtf/text/WTFString.h"
-#include <v8.h>
 
 namespace blink {
 
-class LocalFrame;
+class Frame;
 class ScriptState;
 struct WrapperTypeInfo;
 
@@ -62,8 +62,9 @@ CORE_EXPORT void installConditionalFeaturesOnWindow(const ScriptState*);
 CORE_EXPORT void installPendingConditionalFeature(const String&,
                                                   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*);
 
 }  // namespace blink