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

content/common/content_security_policy/csp_context.h

Index: content/common/content_security_policy/csp_context.h
diff --git a/content/common/content_security_policy/csp_context.h b/content/common/content_security_policy/csp_context.h
index 45895e638f26f95e5b80aae89a89b864cc4d5049..cc5f3b50873a7a62ce363cf3cf9f14f74ce28827 100644
--- a/content/common/content_security_policy/csp_context.h
+++ b/content/common/content_security_policy/csp_context.h
@@ -40,7 +40,8 @@ class CONTENT_EXPORT CSPContext {
 
   void SetSelf(const url::Origin origin);
   bool AllowSelf(const GURL& url);
-  bool ProtocolMatchesSelf(const GURL& url);
+  bool ProtocolIsSelf(const GURL& url);
+  const std::string& GetSelfScheme();
 
   virtual void ReportContentSecurityPolicyViolation(
       const CSPViolationParams& violation_params);