Stop CSP from matching independent scheme/port upgrades

third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp

Index: third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp b/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
index 0a81bf5eac573291ba8cb145ce3b09a3b6648331..7d5b8498b6ca998b23a1ce5743713b1518d9b913 100644
--- a/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
@@ -61,7 +61,7 @@ bool SourceListDirective::allows(
   if (m_allowStar) {
     if (url.protocolIsInHTTPFamily() || url.protocolIs("ftp") ||
         url.protocolIs("ws") || url.protocolIs("wss") ||
-        m_policy->protocolMatchesSelf(url))
+        m_policy->protocolEqualsSelf(url.protocol()))

[andypaicu, 2017/02/24 08:41:00]

We have modified protocolMatchesSelf to be protocolEqualsSelf which does not
treat http family protocols specially. Luckily enough we don't need to do
anything else here because it already handles http family protocols previously
in this check.

       return true;
 
     return hasSourceMatchInList(url, redirectStatus);