update adblock-rust to v0.3.4

brave · Dec 16, 2020 · ecd3e94 · ecd3e94
1 parent ffe62ce
commit ecd3e94
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/DEPS b/DEPS
@@ -1,7 +1,7 @@
 use_relative_paths = True
 
 deps = {
-  "vendor/adblock_rust_ffi": "https://github.com/brave/adblock-rust-ffi.git@a6342c37be1618627395ce6241d36a291e2da72f",
+  "vendor/adblock_rust_ffi": "https://github.com/brave/adblock-rust-ffi.git@496ca6987be657f1f315239f2830ac4a12b2aa69",
   "vendor/extension-whitelist": "https://github.com/brave/extension-whitelist.git@b4d059c73042cacf3a5e9156d4b1698e7bc18678",
   "vendor/hashset-cpp": "https://github.com/brave/hashset-cpp.git@6eab0271d014ff09bd9f38abe1e0c117e13e9aa9",
   "vendor/requests": "https://github.com/kennethreitz/requests@e4d59bedfd3c7f4f254f4f5d036587bcd8152458",

diff --git a/build/rust/Cargo.lock b/build/rust/Cargo.lock
diff --git 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)) {
+          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;