Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

third_party/WebKit/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 "core/frame/csp/CSPSource.h"
 
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
+

[foolip, 2016/05/30 10:10:23]

Intentional?

[Mike West, 2016/05/30 14:59:30]

Not at all! Thanks. :)

 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/KnownPorts.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 CSPSource::CSPSource(ContentSecurityPolicy* policy, const String& scheme, const String& host, int port, const String& path, WildcardDisposition hostWildcard, WildcardDisposition portWildcard)
     : m_policy(policy)
     , m_scheme(scheme)
     , m_host(host)
     , m_port(port)
     , m_path(path)
     , m_hostWildcard(hostWildcard)
     , m_portWildcard(portWildcard)
 {
 }
 
-bool CSPSource::matches(const KURL& url, ContentSecurityPolicy::RedirectStatus redirectStatus) const
+bool CSPSource::matches(const KURL& url, RedirectStatus redirectStatus) const
 {
     if (!schemeMatches(url))
         return false;
     if (isSchemeOnly())
         return true;
-    bool pathsMatch = (redirectStatus == ContentSecurityPolicy::DidRedirect) || pathMatches(url);
+    bool pathsMatch = (redirectStatus == RedirectStatus::FollowedRedirect) || pathMatches(url);
     return hostMatches(url) && portMatches(url) && pathsMatch;
 }
 
 bool CSPSource::schemeMatches(const KURL& url) const
 {
     if (m_scheme.isEmpty())
         return m_policy->protocolMatchesSelf(url);
     if (equalIgnoringCase(m_scheme, "http"))
         return equalIgnoringCase(url.protocol(), "http") || equalIgnoringCase(url.protocol(), "https");
     if (equalIgnoringCase(m_scheme, "ws"))
@@ skipping 60 matching lines @@
 {
     return m_host.isEmpty();
 }
 
 DEFINE_TRACE(CSPSource)
 {
     visitor->trace(m_policy);
 }
 
 } // namespace blink