Replicate feature policy container policies.

content/browser/frame_host/frame_tree_node.cc

 // Copyright 2013 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/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 303 matching lines @@
 
 void FrameTreeNode::SetPendingSandboxFlags(
     blink::WebSandboxFlags sandbox_flags) {
   pending_sandbox_flags_ = sandbox_flags;
 
   // Subframes should always inherit their parent's sandbox flags.
   if (parent())
     pending_sandbox_flags_ |= parent()->effective_sandbox_flags();
 }
 
+void FrameTreeNode::SetPendingContainerPolicy(
+    const ParsedFeaturePolicyHeader& container_policy) {
+  pending_container_policy_ = container_policy;

[alexmos, 2017/04/11 01:17:49]

This is expected to only done for subframe nodes, right?  Can we add a DCHECK
and update the comment in the header about that?

[iclelland, 2017/04/11 17:41:43]

That's correct; there is no situation where the container policy should be
modified on the main frame. Done.

+}
+
 bool FrameTreeNode::IsDescendantOf(FrameTreeNode* other) const {
   if (!other || !other->child_count())
     return false;
 
   for (FrameTreeNode* node = parent(); node; node = node->parent()) {
     if (node == other)
       return true;
   }
 
   return false;
@@ skipping 23 matching lines @@
         render_manager_.speculative_frame_host();
     if (speculative_frame_host && speculative_frame_host->is_loading())
       return true;
   } else {
     if (pending_frame_host && pending_frame_host->is_loading())
       return true;
   }
   return current_frame_host->is_loading();
 }
 
-bool FrameTreeNode::CommitPendingSandboxFlags() {
+bool FrameTreeNode::CommitPendingFramePolicy() {
   bool did_change_flags =
       pending_sandbox_flags_ != replication_state_.sandbox_flags;
-  replication_state_.sandbox_flags = pending_sandbox_flags_;
-  return did_change_flags;
+  bool did_change_container_policy =
+      pending_container_policy_ != replication_state_.container_policy;
+  if (did_change_flags)
+    replication_state_.sandbox_flags = pending_sandbox_flags_;
+  if (did_change_container_policy)
+    replication_state_.container_policy = pending_container_policy_;
+  return did_change_flags || did_change_container_policy;
 }
 
 void FrameTreeNode::CreatedNavigationRequest(
     std::unique_ptr<NavigationRequest> navigation_request) {
   CHECK(IsBrowserSideNavigationEnabled());
 
   // This is never called when navigating to a Javascript URL. For the loading
   // state, this matches what Blink is doing: Blink doesn't send throbber
   // notifications for Javascript URLS.
   DCHECK(!navigation_request->common_params().url.SchemeIs(
@@ skipping 171 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content