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

content/common/content_security_policy/content_security_policy.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 <sstream>
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "content/common/content_security_policy/csp_context.h"
 
 namespace content {
@@ skipping 23 matching lines @@
 std::string ElideURLForReportViolation(const GURL& url) {
   // TODO(arthursonzogni): the url length should be limited to 1024 char. Find
   // a function that will not break the utf8 encoding while eliding the string.
   return url.spec();
 }
 
 void ReportViolation(CSPContext* context,
                      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.
   DCHECK_NE(directive_name, CSPDirective::DefaultSrc);
   DCHECK_NE(directive_name, CSPDirective::ChildSrc);
 
   std::stringstream message;
 
   if (policy.disposition == blink::WebContentSecurityPolicyTypeReport)
     message << "[Report Only] ";
@@ skipping 10 matching lines @@
 
   if (directive.name != directive_name)
     message << " Note that '" << CSPDirective::NameToString(directive_name)
             << "' was not explicitly set, so '"
             << CSPDirective::NameToString(directive.name)
             << "' is used as a fallback.";
 
   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,
                     const ContentSecurityPolicy& policy,
                     const CSPDirective& directive,
                     CSPDirective::Name directive_name,
                     const GURL& url,
                     bool is_redirect) {
   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;
 }
 
 }  // namespace
 
 ContentSecurityPolicy::ContentSecurityPolicy()
     : disposition(blink::WebContentSecurityPolicyTypeEnforce),
       source(blink::WebContentSecurityPolicySourceHTTP) {}
 
 ContentSecurityPolicy::ContentSecurityPolicy(
@@ skipping 49 matching lines @@
     is_first_policy = false;
     text << "report-uri";
     for (const std::string& endpoint : report_endpoints)
       text << " " << endpoint;
   }
 
   return text.str();
 }
 
 }  // namespace content