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

content/common/content_security_policy/csp_context.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/common/content_security_policy/csp_context.h"
 
 namespace content {
 
 CSPContext::CSPContext() : has_self_(false) {}
 
@@ skipping 34 matching lines @@
   self_source_ = CSPSource(
       origin.scheme(), origin.host(), false,
       origin.port() == 0 ? url::PORT_UNSPECIFIED : origin.port(),  // port
       false, "");
 }
 
 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;
 }
 
 bool CSPContext::SelfSchemeShouldBypassCsp() {
   if (!has_self_)
     return false;
   return SchemeShouldBypassCSP(self_scheme_);
 }
 
@@ skipping 23 matching lines @@
       disposition(disposition),
       after_redirect(after_redirect),
       source_location(source_location) {}
 
 CSPViolationParams::CSPViolationParams(const CSPViolationParams& other) =
     default;
 
 CSPViolationParams::~CSPViolationParams() {}
 
 }  // namespace content