CSP: group policies in didAddContentSecurityPolicy.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6a0abc7ac40fb115b619ba3fc13e8feeef8eedf5..b4514d3cf06852efea9b7ed3782f2b7c9f943685 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3253,22 +3253,14 @@ void RenderFrameImpl::didSetFeaturePolicyHeader(
       routing_id_, FeaturePolicyHeaderFromWeb(parsed_header)));
 }
 
-void RenderFrameImpl::didAddContentSecurityPolicy(
-    const blink::WebString& header_value,
-    blink::WebContentSecurityPolicyType type,
-    blink::WebContentSecurityPolicySource source,
-    const std::vector<blink::WebContentSecurityPolicyPolicy>& policies) {
-  ContentSecurityPolicyHeader header;
-  header.header_value = header_value.utf8();
-  header.type = type;
-  header.source = source;
-
+void RenderFrameImpl::didAddContentSecurityPolicies(
+    const blink::WebVector<blink::WebContentSecurityPolicyPolicy>& policies) {
   std::vector<ContentSecurityPolicy> content_policies;
   for (const auto& policy : policies)
     content_policies.push_back(BuildContentSecurityPolicy(policy));
 
-  Send(new FrameHostMsg_DidAddContentSecurityPolicy(routing_id_, header,
-                                                    content_policies));
+  Send(new FrameHostMsg_DidAddContentSecurityPolicies(routing_id_,
+                                                      content_policies));
 }
 
 void RenderFrameImpl::didChangeFrameOwnerProperties(