Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

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

Index: third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp b/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
index f8e597bc6ecb54b399ba6a67b8065eef391da0e4..7568ee2233051e8d5de748f5df3204f43cc5944d 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
@@ -6,6 +6,7 @@
 
 #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"
@@ -24,13 +25,13 @@ CSPSource::CSPSource(ContentSecurityPolicy* policy, const String& scheme, const
 {
 }
 
-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;
 }