| Index: content/common/frame_replication_state.h
|
| diff --git a/content/common/frame_replication_state.h b/content/common/frame_replication_state.h
|
| index 6fb755f758e540ffcaff2719bc5a1b759611bb70..c9cc3590ee857ca8a282ba74a854975edfc186a3 100644
|
| --- a/content/common/frame_replication_state.h
|
| +++ b/content/common/frame_replication_state.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "content/common/content_export.h"
|
| #include "content/common/content_security_policy_header.h"
|
| +#include "content/common/feature_policy/feature_policy.h"
|
| #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
|
| #include "url/origin.h"
|
|
|
| @@ -20,21 +21,6 @@ enum class WebSandboxFlags;
|
|
|
| namespace content {
|
|
|
| -// This struct holds feature policy whitelist data that needs to be replicated
|
| -// between a RenderFrame and any of its associated RenderFrameProxies. A list of
|
| -// these form part of the FrameReplicationState below (one entry per feature).
|
| -struct CONTENT_EXPORT FeaturePolicyParsedWhitelist {
|
| - FeaturePolicyParsedWhitelist();
|
| - FeaturePolicyParsedWhitelist(const FeaturePolicyParsedWhitelist& fppw);
|
| - ~FeaturePolicyParsedWhitelist();
|
| -
|
| - std::string feature_name;
|
| - bool matches_all_origins;
|
| - std::vector<url::Origin> origins;
|
| -};
|
| -
|
| -using ParsedFeaturePolicy = std::vector<FeaturePolicyParsedWhitelist>;
|
| -
|
| // This structure holds information that needs to be replicated between a
|
| // RenderFrame and any of its associated RenderFrameProxies.
|
| struct CONTENT_EXPORT FrameReplicationState {
|
| @@ -101,7 +87,7 @@ struct CONTENT_EXPORT FrameReplicationState {
|
|
|
| // Parsed feature policy header. May be empty if no header was sent with the
|
| // document.
|
| - ParsedFeaturePolicy feature_policy_header;
|
| + FeaturePolicyHeader feature_policy_header;
|
|
|
| // Accumulated CSP headers - gathered from http headers, <meta> elements,
|
| // parent frames (in case of about:blank frames).
|
|
|