CSP: group policies in didAddContentSecurityPolicy.

content/renderer/render_frame_impl.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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 3202 matching lines @@
   Send(new FrameHostMsg_DidChangeSandboxFlags(
       routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags));
 }
 
 void RenderFrameImpl::didSetFeaturePolicyHeader(
     const blink::WebParsedFeaturePolicy& parsed_header) {
   Send(new FrameHostMsg_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(
     blink::WebFrame* child_frame,
     const blink::WebFrameOwnerProperties& frame_owner_properties) {
   Send(new FrameHostMsg_DidChangeFrameOwnerProperties(
       routing_id_, GetRoutingIdForFrameOrProxy(child_frame),
       ConvertWebFrameOwnerPropertiesToFrameOwnerProperties(
           frame_owner_properties)));
 }
@@ skipping 3683 matching lines @@
       policy(info.defaultPolicy),
       replaces_current_history_item(info.replacesCurrentHistoryItem),
       history_navigation_in_new_child_frame(
           info.isHistoryNavigationInNewChildFrame),
       client_redirect(info.isClientRedirect),
       cache_disabled(info.isCacheDisabled),
       form(info.form),
       source_location(info.sourceLocation) {}
 
 }  // namespace content