CSP: Change 'self' to ask the policy object whether a URL matches.

Source/core/frame/csp/CSPSource.cpp

Index: Source/core/frame/csp/CSPSource.cpp
diff --git a/Source/core/frame/csp/CSPSource.cpp b/Source/core/frame/csp/CSPSource.cpp
index bcd510b83053e2afbeb0037d882ee5393bb83f51..1202b0aca47a760e5d46f9e985281cd544fc86e0 100644
--- a/Source/core/frame/csp/CSPSource.cpp
+++ b/Source/core/frame/csp/CSPSource.cpp
@@ -35,12 +35,8 @@ bool CSPSource::matches(const KURL& url) const
 
 bool CSPSource::schemeMatches(const KURL& url) const
 {
-    if (m_scheme.isEmpty()) {
-        String protectedResourceScheme(m_policy->securityOrigin()->protocol());
-        if (equalIgnoringCase("http", protectedResourceScheme))
-            return url.protocolIs("http") || url.protocolIs("https");
-        return equalIgnoringCase(url.protocol(), protectedResourceScheme);
-    }
+    if (m_scheme.isEmpty())
+        return m_policy->protocolMatchesSelf(url);
     return equalIgnoringCase(url.protocol(), m_scheme);
 }