Stop CSP from matching independent scheme/port upgrades (content layer)

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 3d3c9a01da198e9f5381f76ab2b90ba970fa2e87..ab249dd3f25840268f907498e737c57f4e1f32eb 100644
--- a/content/common/content_security_policy/csp_context.cc
+++ b/content/common/content_security_policy/csp_context.cc
@@ -52,14 +52,16 @@ bool CSPContext::AllowSelf(const GURL& url) {
   return has_self_ && CSPSource::Allow(self_source_, url, this);
 }
 
-bool CSPContext::ProtocolMatchesSelf(const GURL& url) {
+bool CSPContext::ProtocolIsSelf(const GURL& url) {
   if (!has_self_)
     return false;
-  if (self_scheme_ == url::kHttpScheme)
-    return url.SchemeIsHTTPOrHTTPS() || url.SchemeIsSuborigin();
   return url.SchemeIs(self_scheme_);
 }
 
+const std::string& CSPContext::GetSelfScheme() {
+  return self_scheme_;
+}
+
 bool CSPContext::SchemeShouldBypassCSP(const base::StringPiece& scheme) {
   return false;
 }