CSP: group policies in didAddContentSecurityPolicy.

content/common/content_security_policy/content_security_policy.h

Index: content/common/content_security_policy/content_security_policy.h
diff --git a/content/common/content_security_policy/content_security_policy.h b/content/common/content_security_policy/content_security_policy.h
index 56454ed27b65104e3a7b7516b3e50699e54629af..7d7b111b9f0e494f6bed1e8e3593396ef90f0f4e 100644
--- a/content/common/content_security_policy/content_security_policy.h
+++ b/content/common/content_security_policy/content_security_policy.h
@@ -23,19 +23,15 @@ class CSPContext;
 // enforced upon requests.
 struct CONTENT_EXPORT ContentSecurityPolicy {
   ContentSecurityPolicy();
-  ContentSecurityPolicy(blink::WebContentSecurityPolicyType disposition,
-                        blink::WebContentSecurityPolicySource source,
+  ContentSecurityPolicy(const ContentSecurityPolicyHeader& header,
                         const std::vector<CSPDirective>& directives,
-                        const std::vector<std::string>& report_endpoints,
-                        const std::string& header);
+                        const std::vector<std::string>& report_endpoints);
   ContentSecurityPolicy(const ContentSecurityPolicy&);
   ~ContentSecurityPolicy();
 
-  blink::WebContentSecurityPolicyType disposition;
-  blink::WebContentSecurityPolicySource source;
+  ContentSecurityPolicyHeader header;
   std::vector<CSPDirective> directives;
   std::vector<std::string> report_endpoints;
-  std::string header;
 
   std::string ToString() const;