Use replicated container policy in remote frames

third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/WebRemoteFrameImpl.h"
 
 #include "bindings/core/v8/WindowProxy.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/RemoteSecurityContext.h"
 #include "core/dom/SecurityContext.h"
@@ skipping 408 matching lines @@
 void WebRemoteFrameImpl::SetReplicatedFeaturePolicyHeader(
     const WebParsedFeaturePolicy& parsed_header) {
   if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
     WebFeaturePolicy* parent_feature_policy = nullptr;
     if (Parent()) {
       Frame* parent_frame = GetFrame()->Client()->Parent();
       parent_feature_policy =
           parent_frame->GetSecurityContext()->GetFeaturePolicy();
     }
     WebParsedFeaturePolicy container_policy;
-    if (GetFrame() && GetFrame()->Owner()) {
-      container_policy = GetContainerPolicyFromAllowedFeatures(
-          GetFrame()->Owner()->AllowedFeatures(),
-          GetFrame()->Owner()->AllowFullscreen(),
-          GetFrame()->Owner()->AllowPaymentRequest(),
-          GetFrame()->GetSecurityContext()->GetSecurityOrigin());
-    }
+    if (GetFrame()->Owner())
+      container_policy = GetFrame()->Owner()->ContainerPolicy();
     GetFrame()->GetSecurityContext()->InitializeFeaturePolicy(
         parsed_header, container_policy, parent_feature_policy);
   }
 }
 
 void WebRemoteFrameImpl::AddReplicatedContentSecurityPolicyHeader(
     const WebString& header_value,
     WebContentSecurityPolicyType type,
     WebContentSecurityPolicySource source) {
   GetFrame()
@@ skipping 90 matching lines @@
 }
 
 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope,
                                        WebRemoteFrameClient* client)
     : WebRemoteFrame(scope),
       frame_client_(RemoteFrameClientImpl::Create(this)),
       client_(client),
       self_keep_alive_(this) {}
 
 }  // namespace blink