CSP: group policies in didAddContentSecurityPolicy.

content/common/content_security_policy/csp_context_unittest.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/common/content_security_policy/csp_context.h"
 #include "content/common/content_security_policy_header.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
@@ skipping 17 matching lines @@
     console_message_ = message;
   }
   std::string console_message_;
   std::vector<std::string> scheme_to_bypass_;
 };
 
 // Build a new policy made of only one directive and no report endpoints.
 ContentSecurityPolicy BuildPolicy(CSPDirective::Name directive_name,
                                   std::vector<CSPSource> sources) {
   return ContentSecurityPolicy(
-      blink::WebContentSecurityPolicyTypeEnforce,
-      blink::WebContentSecurityPolicySourceHTTP,
+      ContentSecurityPolicyHeader(std::string(),  // header
+                                  blink::WebContentSecurityPolicyTypeEnforce,
+                                  blink::WebContentSecurityPolicySourceHTTP),
       {CSPDirective(directive_name, CSPSourceList(false, false, sources))},
-      std::vector<std::string>(),  // report_end_points
-      std::string());              // header
+      std::vector<std::string>());  // report_end_points
 }
 
 }  // namespace;
 
 TEST(CSPContextTest, SchemeShouldBypassCSP) {
   CSPSource source("", "example.com", false, url::PORT_UNSPECIFIED, false, "");
   CSPContextTest context;
   context.AddContentSecurityPolicy(
       BuildPolicy(CSPDirective::DefaultSrc, {source}));
 
@@ skipping 23 matching lines @@
       context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://a.com")));
   EXPECT_FALSE(
       context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://b.com")));
   EXPECT_FALSE(
       context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://c.com")));
   EXPECT_FALSE(
       context.IsAllowedByCsp(CSPDirective::FrameSrc, GURL("http://d.com")));
 }
 
 }  // namespace content