Feature Policy: Only add container policy once

content/common/feature_policy/feature_policy.cc

 // Copyright 2017 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 "content/common/feature_policy/feature_policy.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 
@@ skipping 152 matching lines @@
     const FeaturePolicy::FeatureList& features) {
   std::unique_ptr<FeaturePolicy> new_policy =
       base::WrapUnique(new FeaturePolicy(origin, features));
   for (const auto& feature : features) {
     if (!parent_policy ||
         parent_policy->IsFeatureEnabledForOrigin(feature.first, origin)) {
       new_policy->inherited_policies_[feature.first] = true;
     } else {
       new_policy->inherited_policies_[feature.first] = false;
     }
-    if (parent_policy && !container_policy.empty())
-      new_policy->AddContainerPolicy(container_policy, parent_policy);
   }
+  if (parent_policy && !container_policy.empty())
+    new_policy->AddContainerPolicy(container_policy, parent_policy);
   return new_policy;
 }
 
 void FeaturePolicy::AddContainerPolicy(
     const ParsedFeaturePolicyHeader& container_policy,
     const FeaturePolicy* parent_policy) {
   DCHECK(parent_policy);
   for (const ParsedFeaturePolicyDeclaration& parsed_declaration :
        container_policy) {
     // If a feature is enabled in the parent frame, and the parent chooses to
@@ skipping 49 matching lines @@
                            {blink::WebFeaturePolicyFeature::kSyncXHR,
                             FeaturePolicy::FeatureDefault::EnableForAll},
                            {blink::WebFeaturePolicyFeature::kWebRTC,
                             FeaturePolicy::FeatureDefault::EnableForAll},
                            {blink::WebFeaturePolicyFeature::kUsb,
                             FeaturePolicy::FeatureDefault::EnableForSelf}}));
   return default_feature_list;
 }
 
 }  // namespace content