Merge pull request #16527 from brave/fix-adblock-component-uninstall

Uninstall components for removed regional lists
brave · Jan 4, 2023 · 2263fda · 2263fda
2 parents f0bc5cc + 5cf6ce2
commit 2263fda
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/components/brave_shields/browser/ad_block_component_filters_provider.cc b/components/brave_shields/browser/ad_block_component_filters_provider.cc
@@ -44,7 +44,9 @@ AdBlockComponentFiltersProvider::AdBlockComponentFiltersProvider(
                                       catalog_entry.base64_public_key,
                                       catalog_entry.title) {}
 
-AdBlockComponentFiltersProvider::~AdBlockComponentFiltersProvider() {
+AdBlockComponentFiltersProvider::~AdBlockComponentFiltersProvider() {}
+
+void AdBlockComponentFiltersProvider::UnregisterComponent() {
   // Can be nullptr in unit tests
   if (component_updater_service_) {
     component_updater_service_->UnregisterComponent(component_id_);

diff --git a/components/brave_shields/browser/ad_block_component_filters_provider.h b/components/brave_shields/browser/ad_block_component_filters_provider.h
@@ -52,6 +52,10 @@ class AdBlockComponentFiltersProvider : public AdBlockFiltersProvider {
       base::OnceCallback<void(bool deserialize,
                               const DATFileDataBuffer& dat_buf)>) override;
 
+  // Remove the component. This will force it to be redownloaded next time it
+  // is registered.
+  void UnregisterComponent();
+
  private:
   friend class ::AdBlockServiceTest;
 

diff --git a/components/brave_shields/browser/ad_block_regional_service_manager.cc b/components/brave_shields/browser/ad_block_regional_service_manager.cc
@@ -192,6 +192,7 @@ void AdBlockRegionalServiceManager::EnableFilterList(const std::string& uuid,
     DCHECK(it != regional_filters_providers_.end());
     AdBlockFiltersProviderManager::GetInstance()->RemoveProvider(
         it->second.get());
+    it->second->UnregisterComponent();
     regional_filters_providers_.erase(it);
   }