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

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

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef SecurityContext_h
 #define SecurityContext_h
 
 #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"
 #include "public/platform/WebFeaturePolicy.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/HashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
@@ skipping 43 matching lines @@
 
   virtual void setInsecureRequestPolicy(WebInsecureRequestPolicy policy) {
     m_insecureRequestPolicy = policy;
   }
   WebInsecureRequestPolicy getInsecureRequestPolicy() const {
     return m_insecureRequestPolicy;
   }
 
   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();
   virtual ~SecurityContext();
 
   void setContentSecurityPolicy(ContentSecurityPolicy*);
 
   void applySandboxFlags(SandboxFlags mask);
 
  private:
   RefPtr<SecurityOrigin> m_securityOrigin;
   Member<ContentSecurityPolicy> m_contentSecurityPolicy;
-  std::unique_ptr<FeaturePolicy> m_featurePolicy;
+  std::unique_ptr<WebFeaturePolicy> m_featurePolicy;
 
   SandboxFlags m_sandboxFlags;
 
   WebAddressSpace m_addressSpace;
   WebInsecureRequestPolicy m_insecureRequestPolicy;
   InsecureNavigationsSet m_insecureNavigationsToUpgrade;
 };
 
 }  // namespace blink
 
 #endif  // SecurityContext_h