Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

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

 // 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.
 
 #ifndef CSPSource_h
 #define CSPSource_h
 
 #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"
 
 namespace blink {
 
 class ContentSecurityPolicy;
 class KURL;
 
 class CORE_EXPORT CSPSource : public GarbageCollectedFinalized<CSPSource> {
 public:
     enum WildcardDisposition {
         HasWildcard,
         NoWildcard
     };
 
     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();
 
 private:
     bool schemeMatches(const KURL&) const;
     bool hostMatches(const KURL&) const;
     bool pathMatches(const KURL&) const;
     bool portMatches(const KURL&) const;
     bool isSchemeOnly() const;
 
     Member<ContentSecurityPolicy> m_policy;
     String m_scheme;
     String m_host;
     int m_port;
     String m_path;
 
     WildcardDisposition m_hostWildcard;
     WildcardDisposition m_portWildcard;
 };
 
 } // namespace blink
 
 #endif