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

Source/core/frame/csp/CSPSource.cpp

 // Copyright 2014 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 "config.h"
 #include "core/frame/csp/CSPSource.h"
 
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/KnownPorts.h"
@@ skipping 17 matching lines @@
 {
     if (!schemeMatches(url))
         return false;
     if (isSchemeOnly())
         return true;
     return hostMatches(url) && portMatches(url) && pathMatches(url);
 }
 
 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);
 }
 
 bool CSPSource::hostMatches(const KURL& url) const
 {
     const String& host = url.host();
     if (equalIgnoringCase(host, m_host))
         return true;
     return m_hostHasWildcard && host.endsWith("." + m_host, false);
 
@@ skipping 30 matching lines @@
 
     return false;
 }
 
 bool CSPSource::isSchemeOnly() const
 {
     return m_host.isEmpty();
 }
 
 } // namespace