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

content/common/content_security_policy/content_security_policy.cc

Index: content/common/content_security_policy/content_security_policy.cc
diff --git a/content/common/content_security_policy/content_security_policy.cc b/content/common/content_security_policy/content_security_policy.cc
index 745cb1c2fb11f3c940a7c17e6fd4a29fd38c2594..b091744bd5ad703057af8dfc8ec52c5340ba6c85 100644
--- a/content/common/content_security_policy/content_security_policy.cc
+++ b/content/common/content_security_policy/content_security_policy.cc
@@ -41,8 +41,7 @@
                      const ContentSecurityPolicy& policy,
                      const CSPDirective& directive,
                      const CSPDirective::Name directive_name,
-                     const GURL& url,
-                     bool is_redirect) {
+                     const GURL& url) {
   // We should never have a violation against `child-src` or `default-src`
   // directly; the effective directive should always be one of the explicit
   // fetch directives.
@@ -73,11 +72,10 @@
   message << "\n";
 
   context->LogToConsole(message.str());
-
-  context->ReportContentSecurityPolicyViolation(CSPViolationParams(
-      CSPDirective::NameToString(directive.name),
-      CSPDirective::NameToString(directive_name), message.str(), url,
-      policy.report_endpoints, policy.header, policy.disposition, is_redirect));
+  context->ReportViolation(CSPDirective::NameToString(directive.name),
+                           CSPDirective::NameToString(directive_name),
+                           message.str(), url, policy.report_endpoints,
+                           policy.header, policy.disposition);
 }
 
 bool AllowDirective(CSPContext* context,
@@ -89,7 +87,7 @@
   if (CSPSourceList::Allow(directive.source_list, url, context, is_redirect))
     return true;
 
-  ReportViolation(context, policy, directive, directive_name, url, is_redirect);
+  ReportViolation(context, policy, directive, directive_name, url);
   return false;
 }