[subresource_filter] Replace KMP by std::search.

components/subresource_filter/core/common/url_pattern.h

 // Copyright 2016 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 COMPONENTS_SUBRESOURCE_FILTER_CORE_COMMON_URL_PATTERN_H_
 #define COMPONENTS_SUBRESOURCE_FILTER_CORE_COMMON_URL_PATTERN_H_
 
+#include <iosfwd>
+
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "components/subresource_filter/core/common/proto/rules.pb.h"
 
+class GURL;
+
 namespace subresource_filter {
 
 namespace flat {
 struct UrlRule;  // The FlatBuffers version of UrlRule.
 }
 
 // The structure used to mirror a URL pattern regardless of the representation

[engedy, 2017/04/05 10:55:11]

nit: Should update this comment now that there is behavior to this class.

[pkalinnikov, 2017/04/05 13:29:21]

Done.

 // of the UrlRule that owns it.
-struct UrlPattern {
+class UrlPattern {
+ public:
   UrlPattern();
 
   // Creates a |url_pattern| of a certain |type|.
   UrlPattern(base::StringPiece url_pattern,
              proto::UrlPatternType type = proto::URL_PATTERN_TYPE_WILDCARDED);
 
   // Creates a WILDCARDED |url_pattern| with the specified anchors.
   UrlPattern(base::StringPiece url_pattern,
              proto::AnchorType anchor_left,
              proto::AnchorType anchor_right);
 
   // The following constructors create UrlPattern from one of the UrlRule
   // representations. The passed in |rule| must outlive the created instance.
   explicit UrlPattern(const flat::UrlRule& rule);
   explicit UrlPattern(const proto::UrlRule& rule);
 
   ~UrlPattern();
 
-  proto::UrlPatternType type = proto::URL_PATTERN_TYPE_UNSPECIFIED;
-  base::StringPiece url_pattern;
+  proto::UrlPatternType type() const { return type_; }
+  base::StringPiece url_pattern() const { return url_pattern_; }
+  proto::AnchorType anchor_left() const { return anchor_left_; }
+  proto::AnchorType anchor_right() const { return anchor_right_; }
+  bool match_case() const { return match_case_; }
 
-  proto::AnchorType anchor_left = proto::ANCHOR_TYPE_NONE;
-  proto::AnchorType anchor_right = proto::ANCHOR_TYPE_NONE;
-
-  bool match_case = false;
+  // Returns whether the |url| matches the URL |pattern|. Requires the type of
+  // |this| pattern to be either SUBSTRING or WILDCARDED.
+  // TODO(pkalinnikov): Outline algorithms implemented in this method.

[engedy, 2017/04/05 10:55:11]

nit: Can we resolve this in this CL?

[pkalinnikov, 2017/04/05 13:29:22]

Done.

+  bool MatchesUrl(const GURL& url) const;
 
  private:
+  // TODO(pkalinnikov): Store flat:: types instead of proto::, in order to avoid
+  // convertions in IndexedRuleset.

[engedy, 2017/04/05 10:55:11]

typo: conversions

[pkalinnikov, 2017/04/05 13:29:22]

Done.

+  proto::UrlPatternType type_ = proto::URL_PATTERN_TYPE_UNSPECIFIED;
+  base::StringPiece url_pattern_;
+
+  proto::AnchorType anchor_left_ = proto::ANCHOR_TYPE_NONE;
+  proto::AnchorType anchor_right_ = proto::ANCHOR_TYPE_NONE;
+
+  bool match_case_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(UrlPattern);
 };
 
+// Stream operator so UrlPattern can be used in testing assertions.

[engedy, 2017/04/05 10:55:11]

nit: It can be used in GTest assertions without this as well, right? It is just
that it will be printed as a binary blob. How about:

// Allow pretty-printing URLPatterns when they are used in GTest assertions.

[pkalinnikov, 2017/04/05 13:29:22]

Done.

+std::ostream& operator<<(std::ostream& out, const UrlPattern& pattern);
+
 }  // namespace subresource_filter
 
 #endif  // COMPONENTS_SUBRESOURCE_FILTER_CORE_COMMON_URL_PATTERN_H_