| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index ce8f2725ee2b813aa94e0886dfe200be4c48e5da..3d7c16583a47e7eb3ca1f3e816e097e00f87e975 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -36,6 +36,7 @@
|
| #include "build/build_config.h"
|
| #include "cc/base/switches.h"
|
| #include "content/child/appcache/appcache_dispatcher.h"
|
| +#include "content/child/feature_policy/feature_policy_platform.h"
|
| #include "content/child/quota_dispatcher.h"
|
| #include "content/child/request_extra_data.h"
|
| #include "content/child/service_worker/service_worker_handle_reference.h"
|
| @@ -869,21 +870,6 @@ double ConvertToBlinkTime(const base::TimeTicks& time_ticks) {
|
| return (time_ticks - base::TimeTicks()).InSecondsF();
|
| }
|
|
|
| -ParsedFeaturePolicy ToParsedFeaturePolicy(
|
| - const blink::WebParsedFeaturePolicy& web_parsed_whitelists) {
|
| - ParsedFeaturePolicy result;
|
| - for (const blink::WebFeaturePolicy::ParsedWhitelist& web_whitelist :
|
| - web_parsed_whitelists) {
|
| - FeaturePolicyParsedWhitelist whitelist;
|
| - whitelist.feature_name = web_whitelist.featureName.utf8();
|
| - whitelist.matches_all_origins = web_whitelist.matchesAllOrigins;
|
| - for (const blink::WebSecurityOrigin& web_origin : web_whitelist.origins)
|
| - whitelist.origins.push_back(web_origin);
|
| - result.push_back(whitelist);
|
| - }
|
| - return result;
|
| -}
|
| -
|
| } // namespace
|
|
|
| struct RenderFrameImpl::PendingFileChooser {
|
| @@ -3194,9 +3180,9 @@ void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame,
|
| }
|
|
|
| void RenderFrameImpl::didSetFeaturePolicyHeader(
|
| - const blink::WebParsedFeaturePolicy& parsed_header) {
|
| + const blink::WebParsedFeaturePolicyHeader& parsed_header) {
|
| Send(new FrameHostMsg_DidSetFeaturePolicyHeader(
|
| - routing_id_, ToParsedFeaturePolicy(parsed_header)));
|
| + routing_id_, FeaturePolicyHeaderFromWeb(parsed_header)));
|
| }
|
|
|
| void RenderFrameImpl::didAddContentSecurityPolicy(
|
|
|