Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable first party filters for ABOM (#32853)

Browse Source 
The PR enables Brave First Party Adblock
content filters list when Adblock-Only mode
is enabled.
This commit is contained in:
Aleksei Seren
2025-12-16 16:25:21 -05:00
committed by GitHub
parent 529dc3a442
commit 05abc98131
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/brave_shields/ad_block_service_browsertest.cc
+7 -8
View File
@@ -116,8 +116,6 @@ using brave_shields::features::kCosmeticFilteringJsPerformance;
namespace {
constexpr char kDefaultAdBlockComponentUuid[] = "default";
void WaitForSelectorBlocked(const content::ToRenderFrameHost& target,
const std::string& selector) {
static constexpr char kTemplate[] =
@@ -285,7 +283,8 @@ void AdBlockServiceTest::UpdateAdBlockInstanceWithRules(
auto& component_providers =
component_service_manager()->component_filters_providers();
auto& provider = component_providers.at(kDefaultAdBlockComponentUuid);
auto& provider =
component_providers.at(brave_shields::kDefaultAdblockFiltersListUuid);
EXPECT_TRUE(provider);
provider->OnComponentReady(component_path);
@@ -3346,7 +3345,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockOnlyModeFilterListsTest,
// AdBlockOnlyMode is disabled by default, so all filter lists are enabled.
{
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
kDefaultAdBlockComponentUuid));
brave_shields::kDefaultAdblockFiltersListUuid));
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
brave_shields::kCookieListUuid));
@@ -3361,7 +3360,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockOnlyModeFilterListsTest,
true);
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
kDefaultAdBlockComponentUuid));
brave_shields::kDefaultAdblockFiltersListUuid));
EXPECT_FALSE(component_service_manager()->IsFilterListEnabled(
brave_shields::kCookieListUuid));
@@ -3376,7 +3375,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockOnlyModeFilterListsTest,
false);
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
kDefaultAdBlockComponentUuid));
brave_shields::kDefaultAdblockFiltersListUuid));
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
brave_shields::kCookieListUuid));
@@ -3405,7 +3404,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockOnlyModeFilterListsWithFeatureDisabledTest,
// Check filters lists before AdBlockOnlyMode preference is enabled.
{
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
kDefaultAdBlockComponentUuid));
brave_shields::kDefaultAdblockFiltersListUuid));
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
brave_shields::kCookieListUuid));
@@ -3421,7 +3420,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockOnlyModeFilterListsWithFeatureDisabledTest,
true);
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
kDefaultAdBlockComponentUuid));
brave_shields::kDefaultAdblockFiltersListUuid));
EXPECT_TRUE(component_service_manager()->IsFilterListEnabled(
brave_shields::kCookieListUuid));
components/brave_shields/core/common/brave_shield_constants.h
+5 -1
View File
@@ -107,6 +107,9 @@ inline constexpr char kCosmeticResourcesProceduralActions[] =
const base::FilePath::CharType kCustomSubscriptionListText[] =
FILE_PATH_LITERAL("list_text.txt");
inline constexpr char kDefaultAdblockFiltersListUuid[] = "default";
inline constexpr char kFirstPartyAdblockFiltersListUuid[] =
"E99CBD02-FFD1-4651-9BDD-6A9ED7B87819";
inline constexpr char kCookieListUuid[] =
"AC023D22-AE88-4060-A978-4FEEEC4221693";
inline constexpr char kMobileNotificationsListUuid[] =
@@ -147,7 +150,8 @@ inline constexpr char kCookieListPromptHistogram[] =
// The list of UUIDs of filter lists that will be loaded by AdBlockOnlyMode.
inline constexpr auto kAdblockOnlyModeFilerListUUIDs =
base::MakeFixedFlatSet<std::string_view>({"default"});
base::MakeFixedFlatSet<std::string_view>(
{kDefaultAdblockFiltersListUuid, kFirstPartyAdblockFiltersListUuid});
// The list of language codes that are supported by Ad Block Only mode.
inline constexpr auto kAdblockOnlyModeSupportedLanguageCodes =