CSP: group policies in didAddContentSecurityPolicy.

content/renderer/content_security_policy_util.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/renderer/content_security_policy_util.h"
 
 namespace content {
 
 CSPSource BuildCSPSource(
     const blink::WebContentSecurityPolicySourceExpression& source) {
@@ skipping 28 matching lines @@
 ContentSecurityPolicy BuildContentSecurityPolicy(
     const blink::WebContentSecurityPolicy& policy) {
   std::vector<CSPDirective> directives;
   for (const auto& directive : policy.directives)
     directives.push_back(BuildCSPDirective(directive));
 
   std::vector<std::string> report_endpoints;
   for (const blink::WebString& endpoint : policy.reportEndpoints)
     report_endpoints.push_back(endpoint.utf8());
 
-  return ContentSecurityPolicy(policy.disposition,     // disposition
-                               policy.source,          // source
-                               directives,             // directives
-                               report_endpoints,       // report_endpoints
-                               policy.header.utf8());  // header
+  return ContentSecurityPolicy(
+      ContentSecurityPolicyHeader(policy.header.utf8(), policy.disposition,
+                                  policy.source),
+      directives, report_endpoints);
 }
 
 blink::WebContentSecurityPolicyViolation BuildWebContentSecurityPolicyViolation(
     const content::CSPViolationParams& violation_params) {
   blink::WebContentSecurityPolicyViolation violation;
   violation.directive = blink::WebString::fromASCII(violation_params.directive);
   violation.effectiveDirective =
       blink::WebString::fromASCII(violation_params.effective_directive);
   violation.consoleMessage =
       blink::WebString::fromASCII(violation_params.console_message);
   violation.blockedUrl = violation_params.blocked_url;
   violation.reportEndpoints = blink::WebVector<blink::WebString>(
       violation_params.report_endpoints.size());
   for (size_t i = 0; i < violation_params.report_endpoints.size(); ++i) {
     violation.reportEndpoints[i] =
         blink::WebString::fromASCII(violation_params.report_endpoints[i]);
   }
   violation.header = blink::WebString::fromASCII(violation_params.header);
   violation.disposition = violation_params.disposition;
   violation.afterRedirect = violation_params.after_redirect;
   return violation;
 }
 
 }  // namespace content