Revert "Merge pull request #19946 from brave/unified-adblock-catalog"

This reverts commit 2e1760826c, reversing
changes made to 13c48d9f8f.
This commit is contained in:
Mikhail Atuchin
2023-10-07 22:39:03 +02:00
parent ef000c855b
commit 3cd2cf1ac5
48 changed files with 600 additions and 740 deletions
@@ -13,7 +13,7 @@
#include "brave/components/brave_ads/core/public/prefs/pref_names.h"
#include "brave/components/brave_news/common/pref_names.h"
#include "brave/components/brave_rewards/browser/rewards_service.h"
#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h"
#include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
#include "brave/components/brave_shields/browser/ad_block_service.h"
#include "brave/components/brave_shields/common/brave_shield_constants.h"
#include "chrome/browser/profiles/profile.h"
@@ -33,10 +33,10 @@ void EnableAdblockCookieList(base::WeakPtr<Profile> profile) {
}
// Obtrusive cookie notices list in cosmetic filters.
auto* component_service_manager =
g_brave_browser_process->ad_block_service()->component_service_manager();
if (!component_service_manager ||
!component_service_manager->IsFilterListAvailable(
auto* regional_service_manager =
g_brave_browser_process->ad_block_service()->regional_service_manager();
if (!regional_service_manager ||
!regional_service_manager->IsFilterListAvailable(
brave_shields::kCookieListUuid)) {
base::SequencedTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE, base::BindOnce(&EnableAdblockCookieList, profile),
@@ -44,8 +44,8 @@ void EnableAdblockCookieList(base::WeakPtr<Profile> profile) {
return;
}
component_service_manager->EnableFilterList(brave_shields::kCookieListUuid,
true);
regional_service_manager->EnableFilterList(brave_shields::kCookieListUuid,
true);
}
} // namespace