Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

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

Index: third_party/WebKit/Source/core/frame/csp/CSPSource.h
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPSource.h b/third_party/WebKit/Source/core/frame/csp/CSPSource.h
index 4da4c9ccf4faf9e74b6c1558727e73ba1fe4073c..f40e176d2a2f4808e4ead1f5f70c412d5e481dca 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPSource.h
+++ b/third_party/WebKit/Source/core/frame/csp/CSPSource.h
@@ -8,6 +8,7 @@
 #include "core/CoreExport.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "platform/heap/Handle.h"
+#include "platform/network/ResourceRequest.h"
 #include "wtf/Allocator.h"
 #include "wtf/text/WTFString.h"
 
@@ -24,7 +25,7 @@ public:
     };
 
     CSPSource(ContentSecurityPolicy*, const String& scheme, const String& host, int port, const String& path, WildcardDisposition hostWildcard, WildcardDisposition portWildcard);
-    bool matches(const KURL&, ContentSecurityPolicy::RedirectStatus = ContentSecurityPolicy::DidNotRedirect) const;
+    bool matches(const KURL&, RedirectStatus = ResourceRequest::RedirectStatus::NoRedirect) const;

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

I suppose the alias in ContentSecurityPolicy.h is why this works, but using the
same form twice here would leave no room for confusion. (Is there more than one
type, I asked myself.)

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

Yeah, this was a typo; I moved the enum from outside `ResourceRequest` into
`ResourceRequest` at some point while writing this and apparently did a bad job
updating the usage. :/

 
     DECLARE_TRACE();