Index: content/browser/frame_host/frame_tree_node.cc |
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc |
index 2fdd79c55b1d9dc58ea8b75bce1127ca4e190dbb..be14c709c0a6ab7a14fa17d07840ed5fc735b758 100644 |
--- a/content/browser/frame_host/frame_tree_node.cc |
+++ b/content/browser/frame_host/frame_tree_node.cc |
@@ -291,14 +291,17 @@ |
} |
void FrameTreeNode::AddContentSecurityPolicy( |
- const ContentSecurityPolicyHeader& header) { |
+ const ContentSecurityPolicyHeader& header, |
+ const std::vector<ContentSecurityPolicy>& policies) { |
replication_state_.accumulated_csp_headers.push_back(header); |
render_manager_.OnDidAddContentSecurityPolicy(header); |
-} |
- |
-void FrameTreeNode::ResetCspHeaders() { |
+ csp_policies_.insert(csp_policies_.end(), policies.begin(), policies.end()); |
+} |
+ |
+void FrameTreeNode::ResetContentSecurityPolicy() { |
replication_state_.accumulated_csp_headers.clear(); |
render_manager_.OnDidResetContentSecurityPolicy(); |
+ csp_policies_.clear(); |
} |
void FrameTreeNode::SetInsecureRequestPolicy( |