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

content/common/content_security_policy/csp_context.cc

Index: content/common/content_security_policy/csp_context.cc
diff --git a/content/common/content_security_policy/csp_context.cc b/content/common/content_security_policy/csp_context.cc
index 3c3b0fe533f71b8f64712e4184fc5ef6ae82da97..b7edf25b470d1a9e656b37b4c255d3a56e086fcf 100644
--- a/content/common/content_security_policy/csp_context.cc
+++ b/content/common/content_security_policy/csp_context.cc
@@ -10,13 +10,14 @@
 
 CSPContext::~CSPContext() {}
 
-bool CSPContext::IsAllowedByCsp(CSPDirective::Name directive_name,
-                                const GURL& url,
-                                bool is_redirect) {
+bool CSPContext::Allow(const std::vector<ContentSecurityPolicy>& policies,
+                       CSPDirective::Name directive_name,
+                       const GURL& url,
+                       bool is_redirect) {
   if (SchemeShouldBypassCSP(url.scheme_piece()))
     return true;
 
-  for (const auto& policy : policies_) {
+  for (const auto& policy : policies) {
     if (!ContentSecurityPolicy::Allow(policy, directive_name, url, this,
                                       is_redirect))
       return false;
@@ -67,40 +68,21 @@
   return false;
 }
 
-bool CSPContext::SelfSchemeShouldBypassCsp() {
+bool CSPContext::SelfSchemeShouldBypassCSP() {
   if (!has_self_)
     return false;
   return SchemeShouldBypassCSP(self_scheme_);
 }
 
-void CSPContext::ReportContentSecurityPolicyViolation(
-    const CSPViolationParams& violation_params) {
+void CSPContext::ReportViolation(
+    const std::string& directive_text,
+    const std::string& effective_directive,
+    const std::string& message,
+    const GURL& blocked_url,
+    const std::vector<std::string>& report_end_points,
+    const std::string& header,
+    blink::WebContentSecurityPolicyType disposition) {
   return;
 }
 
-CSPViolationParams::CSPViolationParams() = default;
-
-CSPViolationParams::CSPViolationParams(
-    const std::string& directive,
-    const std::string& effective_directive,
-    const std::string& console_message,
-    const GURL& blocked_url,
-    const std::vector<std::string>& report_endpoints,
-    const std::string& header,
-    const blink::WebContentSecurityPolicyType& disposition,
-    bool after_redirect)
-    : directive(directive),
-      effective_directive(effective_directive),
-      console_message(console_message),
-      blocked_url(blocked_url),
-      report_endpoints(report_endpoints),
-      header(header),
-      disposition(disposition),
-      after_redirect(after_redirect) {}
-
-CSPViolationParams::CSPViolationParams(const CSPViolationParams& other) =
-    default;
-
-CSPViolationParams::~CSPViolationParams() {}
-
 }  // namespace content