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

third_party/WebKit/Source/core/dom/SecurityContext.h

Index: third_party/WebKit/Source/core/dom/SecurityContext.h
diff --git a/third_party/WebKit/Source/core/dom/SecurityContext.h b/third_party/WebKit/Source/core/dom/SecurityContext.h
index b28a75d329c4b165fa9d631707b574fd45839428..d052759f2bc907404160aa76d953e637261f22d2 100644
--- a/third_party/WebKit/Source/core/dom/SecurityContext.h
+++ b/third_party/WebKit/Source/core/dom/SecurityContext.h
@@ -29,7 +29,6 @@
 
 #include "core/CoreExport.h"
 #include "core/dom/SandboxFlags.h"
-#include "platform/feature_policy/FeaturePolicy.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/Suborigin.h"
 #include "public/platform/WebAddressSpace.h"
@@ -93,13 +92,10 @@ class CORE_EXPORT SecurityContext : public GarbageCollectedMixin {
 
   void enforceSuborigin(const Suborigin&);
 
-  FeaturePolicy* getFeaturePolicy() const { return m_featurePolicy.get(); }
-  void setFeaturePolicyForTesting(std::unique_ptr<FeaturePolicy> newPolicy) {
-    m_featurePolicy = std::move(newPolicy);
-  }
-  void setFeaturePolicyFromHeader(
-      const WebParsedFeaturePolicyHeader& parsedHeader,
-      FeaturePolicy* parentFeaturePolicy);
+  WebFeaturePolicy* getFeaturePolicy() const { return m_featurePolicy.get(); }
+  void initializeFeaturePolicy(const WebParsedFeaturePolicyHeader& parsedHeader,
+                               const WebFeaturePolicy* parentFeaturePolicy);
+  void updateFeaturePolicyOrigin();
 
  protected:
   SecurityContext();
@@ -112,7 +108,7 @@ class CORE_EXPORT SecurityContext : public GarbageCollectedMixin {
  private:
   RefPtr<SecurityOrigin> m_securityOrigin;
   Member<ContentSecurityPolicy> m_contentSecurityPolicy;
-  std::unique_ptr<FeaturePolicy> m_featurePolicy;
+  std::unique_ptr<WebFeaturePolicy> m_featurePolicy;
 
   SandboxFlags m_sandboxFlags;