| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index 843f030d952016852709f69a44b0fccf1cb35645..ed11ec780ec49a325d733bc37cdf8ae7c8c6eb5c 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -49,19 +49,19 @@ static base::LazyInstance<RoutingIDProxyMap> g_routing_id_proxy_map =
|
| typedef std::map<blink::WebFrame*, RenderFrameProxy*> FrameMap;
|
| base::LazyInstance<FrameMap> g_frame_map = LAZY_INSTANCE_INITIALIZER;
|
|
|
| -blink::WebParsedFeaturePolicy ToWebParsedFeaturePolicy(
|
| - const ParsedFeaturePolicy& parsed_whitelists) {
|
| - std::vector<blink::WebFeaturePolicy::ParsedWhitelist> result;
|
| - for (const FeaturePolicyParsedWhitelist& whitelist : parsed_whitelists) {
|
| - blink::WebFeaturePolicy::ParsedWhitelist web_whitelist;
|
| - web_whitelist.featureName =
|
| - blink::WebString::fromUTF8(whitelist.feature_name);
|
| - web_whitelist.matchesAllOrigins = whitelist.matches_all_origins;
|
| +blink::WebParsedFeaturePolicyHeader ToWebParsedFeaturePolicyHeader(
|
| + const ParsedFeaturePolicyHeader& parsed_header) {
|
| + std::vector<blink::WebParsedFeaturePolicyDeclaration> result;
|
| + for (const ParsedFeaturePolicyDeclaration& declaration : parsed_header) {
|
| + blink::WebParsedFeaturePolicyDeclaration web_declaration;
|
| + web_declaration.featureName =
|
| + blink::WebString::fromUTF8(declaration.feature_name);
|
| + web_declaration.matchesAllOrigins = declaration.matches_all_origins;
|
| std::vector<blink::WebSecurityOrigin> web_origins;
|
| - for (const url::Origin& origin : whitelist.origins)
|
| + for (const url::Origin& origin : declaration.origins)
|
| web_origins.push_back(origin);
|
| - web_whitelist.origins = web_origins;
|
| - result.push_back(web_whitelist);
|
| + web_declaration.origins = web_origins;
|
| + result.push_back(web_declaration);
|
| }
|
| return result;
|
| }
|
| @@ -241,7 +241,7 @@ void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
|
| web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
|
| state.has_potentially_trustworthy_unique_origin);
|
| web_frame_->setReplicatedFeaturePolicyHeader(
|
| - ToWebParsedFeaturePolicy(state.feature_policy_header));
|
| + ToWebParsedFeaturePolicyHeader(state.feature_policy_header));
|
| if (state.has_received_user_gesture)
|
| web_frame_->setHasReceivedUserGesture();
|
|
|
|
|