UrlPatternIndex: Introduce ElementType and ActivationType enums to url_pattern_index schema.

components/url_pattern_index/url_pattern_index.h

 // Copyright 2017 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_URL_PATTERN_INDEX_URL_PATTERN_INDEX_H_
 #define COMPONENTS_URL_PATTERN_INDEX_URL_PATTERN_INDEX_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 98 matching lines @@
   //    registry_controlled_domains library, to reflect the relation between
   //    |url| and |first_party_origin|.
   //
   // A rule is deemed to match the request iff all of the following applies:
   //  - The |url| matches the rule's UrlPattern (see url_pattern.h).
   //  - The |first_party_origin| matches the rule's targeted domains list.
   //  - |element_type| or |activation_type| is among the rule's targeted types.
   //  - The |is_third_party| bit matches the rule's requirement on the requested
   //    |url| being first-/third-party w.r.t. its |first_party_origin|.
   //  - The rule is not generic if |disable_generic_rules| is true.
   const flat::UrlRule* FindMatch(const GURL& url,

[pkalinnikov, 2017/06/28 15:59:43]

Do you mean this method and proto-specific code to be removed from
url_pattern_index in a follow-up?

[karandeepb, 2017/06/29 00:58:18]

Eventually yeah this should be removed, however I am currently not working on a
followup to this. This CL is meant to allow url_pattern_index clients to not
have a proto dependency. 

I'll try and take it on once I get the time, or maybe you can work on it?

[pkalinnikov, 2017/06/29 09:19:16]

I can do that, no worries.

                                  const url::Origin& first_party_origin,
                                  proto::ElementType element_type,
                                  proto::ActivationType activation_type,
                                  bool is_third_party,
                                  bool disable_generic_rules) const;
 
  private:
+  const flat::UrlRule* FindMatch(const GURL& url,
+                                 const url::Origin& first_party_origin,
+                                 flat::ElementType element_type,
+                                 flat::ActivationType activation_type,
+                                 bool is_third_party,
+                                 bool disable_generic_rules) const;
+
   // Must outlive this instance.
   const flat::UrlPatternIndex* flat_index_;
 
   DISALLOW_COPY_AND_ASSIGN(UrlPatternIndexMatcher);
 };
 
 }  // namespace url_pattern_index
 
 #endif  // COMPONENTS_URL_PATTERN_INDEX_URL_PATTERN_INDEX_H_