UrlPatternIndex: Introduce ElementType and ActivationType enums to url_pattern_index schema.

components/subresource_filter/core/common/indexed_ruleset.cc

 // 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.
 
 #include "components/subresource_filter/core/common/indexed_ruleset.h"
 
 #include "base/logging.h"
 #include "components/subresource_filter/core/common/first_party_origin.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace subresource_filter {
 
 namespace proto = url_pattern_index::proto;
 
 // RulesetIndexer --------------------------------------------------------------
 
 // static
-const int RulesetIndexer::kIndexedFormatVersion = 17;
+const int RulesetIndexer::kIndexedFormatVersion = 18;
 
 RulesetIndexer::RulesetIndexer()
     : blacklist_(&builder_), whitelist_(&builder_), deactivation_(&builder_) {}
 
 RulesetIndexer::~RulesetIndexer() = default;
 
 bool RulesetIndexer::AddUrlRule(const proto::UrlRule& rule) {
   const auto offset = url_pattern_index::SerializeUrlRule(rule, &builder_);
   // Note: A zero offset.o means a "nullptr" offset. It is returned when the
   // rule has not been serialized.
@@ skipping 57 matching lines @@
   const bool is_third_party = first_party.IsThirdParty(url);
   return !!blacklist_.FindMatch(url, first_party.origin(), element_type,
                                 proto::ACTIVATION_TYPE_UNSPECIFIED,
                                 is_third_party, disable_generic_rules) &&
          !whitelist_.FindMatch(url, first_party.origin(), element_type,
                                proto::ACTIVATION_TYPE_UNSPECIFIED,
                                is_third_party, disable_generic_rules);
 }
 
 }  // namespace subresource_filter