Skip to content

Commit

Permalink
Merge pull request #7412 from brave/adblock-rust-0.3.4
Browse files Browse the repository at this point in the history
Update adblock-rust to v0.3.4
  • Loading branch information
antonok-edm authored and mkarolin committed Jan 11, 2021
1 parent 445e49f commit 79a9fcc
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions components/brave_shields/browser/ad_block_base_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 79a9fcc

Please sign in to comment.