PlzNavigate: Enforce 'frame-src' CSP on the browser.

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"
-#include "third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h"
 
 namespace content {
 
 CSPSource BuildCSPSource(
     const blink::WebContentSecurityPolicySourceExpression& source) {
   return CSPSource(
       source.scheme.utf8(),  // scheme
       source.host.utf8(),    // host
       source.isHostWildcard == blink::WebWildcardDispositionHasWildcard,
       source.port == 0 ? url::PORT_UNSPECIFIED : source.port,  // port
@@ skipping 28 matching lines @@
   std::vector<std::string> report_endpoints;
   for (const blink::WebString& endpoint : policy.reportEndpoints)
     report_endpoints.push_back(endpoint.utf8());
 
   return CSPPolicy(policy.disposition,  // disposition
                    policy.source,       // source
                    directives,          // directives
                    report_endpoints);   // 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)

[nasko, 2017/02/15 21:28:45]

This for loop needs {} as the body spans more than one line.

[arthursonzogni, 2017/02/16 17:32:41]

Done.

+    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.followedRedirect = violation_params.followed_redirect;
+  return violation;
+}
+
 }  // namespace content