From 79a9fccdf8ec37e0edd3f054e1996270fbcc9aaf Mon Sep 17 00:00:00 2001 From: Anton Lazarev Date: Tue, 22 Dec 2020 10:55:36 -0500 Subject: [PATCH] Merge pull request #7412 from brave/adblock-rust-0.3.4 Update adblock-rust to v0.3.4 --- .../brave_shields/browser/ad_block_base_service.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/brave_shields/browser/ad_block_base_service.cc b/components/brave_shields/browser/ad_block_base_service.cc index 86f8ec652637..c3255d04c781 100644 --- a/components/brave_shields/browser/ad_block_base_service.cc +++ b/components/brave_shields/browser/ad_block_base_service.cc @@ -128,13 +128,11 @@ bool AdBlockBaseService::ShouldStartRequest( url, url::Origin::CreateFromNormalizedTuple("https", tab_host.c_str(), 80), INCLUDE_PRIVATE_REGISTRIES); - // TODO(spinda): Remove explicit_cancel here when removed from adblock-rust. - bool explicit_cancel; bool saved_from_exception; - if (ad_block_client_->matches( - url.spec(), url.host(), tab_host, is_third_party, - ResourceTypeToString(resource_type), &explicit_cancel, - &saved_from_exception, mock_data_url)) { + if (ad_block_client_->matches(url.spec(), url.host(), tab_host, + is_third_party, + ResourceTypeToString(resource_type), + &saved_from_exception, mock_data_url)) { // We'd only possibly match an exception filter if we're returning true. if (did_match_exception) { *did_match_exception = false;