Splitting *Matches functions in CSPSource

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"
@@ skipping 17 matching lines @@
             const String& path,
             WildcardDisposition hostWildcard,
             WildcardDisposition portWildcard);
   bool matches(const KURL&,
                ResourceRequest::RedirectStatus =
                    ResourceRequest::RedirectStatus::NoRedirect) const;
 
   DECLARE_TRACE();
 
  private:
-  bool schemeMatches(const KURL&) const;
-  bool hostMatches(const KURL&) const;
-  bool pathMatches(const KURL&) const;
-  bool portMatches(const KURL&) const;
+  bool schemeMatches(const String&) const;
+  bool hostMatches(const String&) const;
+  bool pathMatches(const String&) const;
+  bool portMatches(int, const String&) const;

[Mike West, 2016/10/26 16:29:22]

Nit: Can you add a comment (and argument name) for the protocol in
`portMatches()`? I had to skim through the code to understand why you needed to
add it.

Otherwise, LGTM!

   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