Commit a3bc216e authored by Tarun Bansal's avatar Tarun Bansal Committed by Commit Bot

Speculatively Revert "[url_pattern_index] Print matching rule for tracing"

This reverts commit 1c7e7665.

Reason for revert:
Fails test org.chromium.chrome.browser.SubresourceFilterTest#resourceFilteredClose
See https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Android%20CFI/3471

Original change's description:
> [url_pattern_index] Print matching rule for tracing
> 
> This is useful for debugging.
> 
> Bug: None
> Change-Id: I8e6260f09b3c17f0a9952739387f70a431571011
> Reviewed-on: https://chromium-review.googlesource.com/c/1308013
> Commit-Queue: Charlie Harrison <csharrison@chromium.org>
> Reviewed-by: Josh Karlin <jkarlin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#603990}

TBR=jkarlin@chromium.org,csharrison@chromium.org

Change-Id: I44e487142ab5c3477ff77945a3f2854bb9762056
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/c/1308904Reviewed-by: default avatarTarun Bansal <tbansal@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604073}
parent d2896e77
...@@ -15,7 +15,7 @@ static_library("tools_lib") { ...@@ -15,7 +15,7 @@ static_library("tools_lib") {
"../core/browser", "../core/browser",
"../core/common", "../core/common",
"//base", "//base",
"//components/url_pattern_index", "//components/url_pattern_index:util",
"//url", "//url",
] ]
} }
......
...@@ -14,8 +14,6 @@ static_library("url_pattern_index") { ...@@ -14,8 +14,6 @@ static_library("url_pattern_index") {
"url_pattern.h", "url_pattern.h",
"url_pattern_index.cc", "url_pattern_index.cc",
"url_pattern_index.h", "url_pattern_index.h",
"url_rule_util.cc",
"url_rule_util.h",
] ]
public_deps = [ public_deps = [
...@@ -46,6 +44,17 @@ static_library("test_support") { ...@@ -46,6 +44,17 @@ static_library("test_support") {
] ]
} }
static_library("util") {
sources = [
"url_rule_util.cc",
"url_rule_util.h",
]
deps = [
":url_pattern_index",
"//base",
]
}
source_set("unit_tests") { source_set("unit_tests") {
testonly = true testonly = true
sources = [ sources = [
...@@ -60,6 +69,7 @@ source_set("unit_tests") { ...@@ -60,6 +69,7 @@ source_set("unit_tests") {
deps = [ deps = [
":test_support", ":test_support",
":url_pattern_index", ":url_pattern_index",
":util",
"//base", "//base",
"//testing/gtest", "//testing/gtest",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
......
...@@ -17,10 +17,8 @@ ...@@ -17,10 +17,8 @@
#include "base/optional.h" #include "base/optional.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
#include "components/url_pattern_index/ngram_extractor.h" #include "components/url_pattern_index/ngram_extractor.h"
#include "components/url_pattern_index/url_pattern.h" #include "components/url_pattern_index/url_pattern.h"
#include "components/url_pattern_index/url_rule_util.h"
#include "url/gurl.h" #include "url/gurl.h"
#include "url/origin.h" #include "url/origin.h"
#include "url/url_constants.h" #include "url/url_constants.h"
...@@ -795,15 +793,9 @@ const flat::UrlRule* UrlPatternIndexMatcher::FindMatch( ...@@ -795,15 +793,9 @@ const flat::UrlRule* UrlPatternIndexMatcher::FindMatch(
return nullptr; return nullptr;
} }
auto* rule = FindMatchInFlatUrlPatternIndex( return FindMatchInFlatUrlPatternIndex(
*flat_index_, UrlPattern::UrlInfo(url), first_party_origin, element_type, *flat_index_, UrlPattern::UrlInfo(url), first_party_origin, element_type,
activation_type, is_third_party, disable_generic_rules, strategy); activation_type, is_third_party, disable_generic_rules, strategy);
if (rule) {
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
"UrlPatternIndexMatcher::FindMatch", "pattern",
FlatUrlRuleToFilterlistString(rule));
}
return rule;
} }
} // namespace url_pattern_index } // namespace url_pattern_index
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment