Skip to content

Commit acaf009

Browse files
brave-buildsbrave-builds
authored
Revert unified adblock catalog (uplift to 1.60.x) (#20459)
Uplift of #20442 (squashed) to beta
1 parent a174cde commit acaf009

File tree

57 files changed

+628
-939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+628
-939
lines changed

‎android/android_browser_tests.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ android_test_exception_sources = [
8989
"//brave/components/brave_rewards/browser/test/rewards_publisher_browsertest.cc",
9090
"//brave/components/brave_rewards/browser/test/rewards_state_browsertest.cc",
9191
"//brave/components/brave_shields/browser/https_everywhere_service_browsertest.cc",
92+
"//brave/components/brave_shields/browser/test_filters_provider.cc",
9293
"//brave/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc",
9394
"//brave/third_party/blink/renderer/modules/brave/navigator_browsertest.cc",
9495
"//chrome/browser/extensions/browsertest_util.cc",
@@ -118,7 +119,6 @@ android_test_exception_deps = [
118119
"//brave/browser/ui:browser_tests",
119120
"//brave/browser/ui/tabs/test:browser_tests",
120121
"//brave/browser/ui/views/tabs:browser_tests",
121-
"//brave/components/brave_shields/browser:test_support",
122122
"//brave/components/brave_wallet/resources:ethereum_provider_generated_resources",
123123
"//brave/components/de_amp/browser/test:browser_tests",
124124
"//brave/renderer/skus:browser_tests",

‎browser/brave_browser_process_impl.cc

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h"
2828
#include "brave/components/brave_component_updater/browser/local_data_files_service.h"
2929
#include "brave/components/brave_referrals/browser/brave_referrals_service.h"
30+
#include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
3031
#include "brave/components/brave_shields/browser/ad_block_service.h"
3132
#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h"
3233
#include "brave/components/brave_shields/browser/brave_farbling_service.h"

‎browser/brave_shields/ad_block_service_browsertest.cc

+164-209
Large diffs are not rendered by default.

‎browser/brave_shields/ad_block_service_browsertest.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class AdBlockServiceTest : public extensions::ExtensionBrowserTest {
4040

4141
HostContentSettingsMap* content_settings();
4242
void UpdateAdBlockInstanceWithRules(const std::string& rules,
43-
const std::string& resources = "[]",
44-
uint8_t permission_mask = 0);
43+
const std::string& resources = "[]");
4544
void UpdateAdBlockInstanceWithDAT(const base::FilePath& dat_location,
4645
const std::string& resources = "[]");
4746
void UpdateCustomAdBlockInstanceWithRules(
@@ -52,9 +51,9 @@ class AdBlockServiceTest : public extensions::ExtensionBrowserTest {
5251
void GetTestDataDir(base::FilePath* test_data_dir);
5352
void SetDefaultComponentIdAndBase64PublicKeyForTest();
5453
void SetRegionalComponentIdAndBase64PublicKeyForTest();
55-
bool InstallDefaultAdBlockComponent(
54+
bool InstallDefaultAdBlockExtension(
5655
const std::string& extension_dir = "adblock-default");
57-
bool InstallRegionalAdBlockComponent(const std::string& uuid,
56+
bool InstallRegionalAdBlockExtension(const std::string& uuid,
5857
bool enable_list = true);
5958
void SetSubscriptionIntervals();
6059
void WaitForAdBlockServiceThreads();

‎browser/brave_shields/domain_block_page_browsertest.cc

+13-13
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class DomainBlockDisabledTest : public DomainBlockTestBase {
105105
};
106106

107107
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitial) {
108-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
108+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
109109
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
110110
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
111111

@@ -121,7 +121,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitial) {
121121
}
122122

123123
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitialAndProceed) {
124-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
124+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
125125
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
126126
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
127127

@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitialAndProceed) {
145145
}
146146

147147
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitialAndReload) {
148-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
148+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
149149
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
150150
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
151151

@@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitialAndReload) {
166166
}
167167

168168
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ProceedAndReload) {
169-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
169+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
170170
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
171171
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
172172

@@ -199,7 +199,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ProceedAndReload) {
199199
}
200200

201201
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ProceedDoesNotAffectNewTabs) {
202-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
202+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
203203
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
204204
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
205205

@@ -233,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ProceedDoesNotAffectNewTabs) {
233233
}
234234

235235
IN_PROC_BROWSER_TEST_F(DomainBlockTest, DontWarnAgainAndProceed) {
236-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
236+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
237237
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
238238
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
239239

@@ -274,7 +274,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, DontWarnAgainAndProceed) {
274274
}
275275

276276
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitialAndGoBack) {
277-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
277+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
278278
GURL url_a = embedded_test_server()->GetURL("a.com", "/simple.html");
279279
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK,
280280
url_a);
@@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ShowInterstitialAndGoBack) {
300300
}
301301

302302
IN_PROC_BROWSER_TEST_F(DomainBlockTest, NoFetch) {
303-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
303+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
304304
ASSERT_EQ(0, request_count_);
305305
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
306306
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
@@ -319,7 +319,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, NoFetch) {
319319
}
320320

321321
IN_PROC_BROWSER_TEST_F(DomainBlockTest, NoThirdPartyInterstitial) {
322-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
322+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
323323
ASSERT_TRUE(g_brave_browser_process->ad_block_service()
324324
->custom_filters_provider()
325325
->UpdateCustomFilters("||b.com^$third-party"));
@@ -354,7 +354,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, NoThirdPartyInterstitial) {
354354
}
355355

356356
IN_PROC_BROWSER_TEST_F(DomainBlockTest, NoInterstitialUnlessAggressive) {
357-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
357+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
358358
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
359359
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
360360

@@ -387,7 +387,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, NoInterstitialUnlessAggressive) {
387387
}
388388

389389
IN_PROC_BROWSER_TEST_F(DomainBlockDisabledTest, NoInterstitial) {
390-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
390+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
391391
GURL url = embedded_test_server()->GetURL("a.com", "/simple.html");
392392
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK, url);
393393

@@ -409,7 +409,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockDisabledTest, NoInterstitial) {
409409
}
410410

411411
IN_PROC_BROWSER_TEST_F(DomainBlockTest, ProceedDoesNotAffectOtherDomains) {
412-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
412+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
413413
GURL url_a = embedded_test_server()->GetURL("a.com", "/simple.html");
414414
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK,
415415
url_a);
@@ -450,7 +450,7 @@ IN_PROC_BROWSER_TEST_F(DomainBlockTest, ProceedDoesNotAffectOtherDomains) {
450450

451451
IN_PROC_BROWSER_TEST_F(DomainBlockTest,
452452
DontWarnAgainDoesNotAffectOtherDomains) {
453-
ASSERT_TRUE(InstallDefaultAdBlockComponent());
453+
ASSERT_TRUE(InstallDefaultAdBlockExtension());
454454
GURL url_a = embedded_test_server()->GetURL("a.com", "/simple.html");
455455
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK,
456456
url_a);

‎browser/debounce/debounce_browsertest.cc

+20-2
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,35 @@
55

66
#include "base/base64url.h"
77
#include "base/memory/raw_ptr.h"
8+
#include "base/path_service.h"
89
#include "base/scoped_observation.h"
910
#include "base/strings/stringprintf.h"
1011
#include "base/test/scoped_feature_list.h"
1112
#include "base/test/thread_test_helper.h"
1213
#include "brave/browser/brave_browser_process.h"
1314
#include "brave/browser/brave_content_browser_client.h"
1415
#include "brave/browser/extensions/brave_base_local_data_files_browsertest.h"
16+
#include "brave/components/brave_shields/browser/ad_block_component_filters_provider.h"
1517
#include "brave/components/brave_shields/browser/ad_block_service.h"
1618
#include "brave/components/brave_shields/browser/brave_shields_util.h"
1719
#include "brave/components/brave_shields/browser/test_filters_provider.h"
20+
#include "brave/components/constants/brave_paths.h"
1821
#include "brave/components/debounce/browser/debounce_component_installer.h"
1922
#include "brave/components/debounce/common/features.h"
2023
#include "brave/components/debounce/common/pref_names.h"
2124
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
2225
#include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
2326
#include "chrome/test/base/in_process_browser_test.h"
2427
#include "chrome/test/base/ui_test_utils.h"
28+
#include "components/network_session_configurator/common/network_switches.h"
2529
#include "content/public/browser/notification_service.h"
2630
#include "content/public/common/content_client.h"
2731
#include "content/public/test/browser_test.h"
2832
#include "content/public/test/browser_test_utils.h"
2933
#include "content/public/test/test_utils.h"
3034
#include "net/base/url_util.h"
35+
#include "net/dns/mock_host_resolver.h"
36+
#include "net/test/embedded_test_server/default_handlers.h"
3137
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
3238

3339
namespace {
@@ -175,7 +181,19 @@ class DebounceBrowserTest : public BaseLocalDataFilesBrowserTest {
175181
EXPECT_EQ(web_contents()->GetLastCommittedURL(), landing_url);
176182
}
177183

178-
bool InitAdBlockForDebounce() {
184+
bool InstallAdBlockForDebounce() {
185+
base::FilePath test_data_dir;
186+
GetTestDataDir(&test_data_dir);
187+
const extensions::Extension* ad_block_extension =
188+
InstallExtension(test_data_dir.AppendASCII("adblock-data")
189+
.AppendASCII("adblock-default"),
190+
1);
191+
if (!ad_block_extension) {
192+
return false;
193+
}
194+
g_brave_browser_process->ad_block_service()
195+
->default_filters_provider()
196+
->OnComponentReady(ad_block_extension->path());
179197
auto source_provider = std::make_unique<brave_shields::TestFiltersProvider>(
180198
"||blocked.com^", "[]");
181199
g_brave_browser_process->ad_block_service()->UseSourceProvidersForTest(
@@ -421,7 +439,7 @@ IN_PROC_BROWSER_TEST_F(DebounceBrowserTest, DebounceBeforeDomainBlock) {
421439
// Install adblock, turn on aggressive blocking for this URL, then attempt to
422440
// navigate to it. This should be interrupted by the domain block
423441
// interstitial.
424-
ASSERT_TRUE(InitAdBlockForDebounce());
442+
ASSERT_TRUE(InstallAdBlockForDebounce());
425443
SetCosmeticFilteringControlType(content_settings(), ControlType::BLOCK,
426444
original_url);
427445
NavigateTo(original_url);

‎browser/ephemeral_storage/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ source_set("browser_tests") {
2727
"//brave/browser",
2828
"//brave/components/brave_component_updater/browser",
2929
"//brave/components/brave_shields/browser",
30-
"//brave/components/brave_shields/browser:test_support",
3130
"//brave/components/brave_shields/common",
3231
"//brave/components/ephemeral_storage",
3332
"//chrome/browser",

‎browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc

+1-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "brave/components/brave_component_updater/browser/local_data_files_service.h"
1313
#include "brave/components/brave_shields/browser/ad_block_service.h"
1414
#include "brave/components/brave_shields/browser/brave_shields_util.h"
15-
#include "brave/components/brave_shields/browser/engine_test_observer.h"
1615
#include "brave/components/brave_shields/browser/test_filters_provider.h"
1716
#include "brave/components/brave_shields/common/features.h"
1817
#include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
@@ -49,11 +48,7 @@ class EphemeralStorage1pDomainBlockBrowserTest
4948
g_brave_browser_process->ad_block_service();
5049
ad_block_service->UseSourceProvidersForTest(source_provider_.get(),
5150
source_provider_.get());
52-
53-
auto* engine =
54-
g_brave_browser_process->ad_block_service()->default_engine_.get();
55-
EngineTestObserver engine_observer(engine);
56-
engine_observer.Wait();
51+
WaitForAdBlockServiceThreads();
5752
}
5853

5954
void WaitForAdBlockServiceThreads() {

‎browser/net/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ source_set("unit_tests") {
207207
"//brave/components/brave_rewards/common",
208208
"//brave/components/brave_rewards/common:features",
209209
"//brave/components/brave_shields/browser",
210-
"//brave/components/brave_shields/browser:test_support",
211210
"//brave/components/l10n/common:test_support",
212211
"//chrome/test:test_support",
213212
"//content/test:test_support",

‎browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/* Copyright (c) 2019 The Brave Software Team. Distributed under the MPL2
2-
* license. This Source Code Form is subject to the terms of the Mozilla Public
3-
* License, v. 2.0. If a copy of the MPL was not distributed with this
4-
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
1+
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
2+
* This Source Code Form is subject to the terms of the Mozilla Public
3+
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
4+
* You can obtain one at https://mozilla.org/MPL/2.0/. */
55

66
#include "brave/browser/net/brave_ad_block_tp_network_delegate_helper.h"
77

@@ -128,7 +128,6 @@ class BraveAdBlockTPNetworkDelegateHelperTest : public testing::Test {
128128
filters_provider_ = std::make_unique<TestFiltersProvider>(rules, resources);
129129
g_brave_browser_process->ad_block_service()->UseSourceProvidersForTest(
130130
filters_provider_.get(), filters_provider_.get());
131-
task_environment_.RunUntilIdle();
132131
}
133132

134133
// Returns true if the request handler deferred control back to the calling

‎browser/perf/brave_perf_features_processor.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "brave/components/brave_ads/core/public/prefs/pref_names.h"
1414
#include "brave/components/brave_news/common/pref_names.h"
1515
#include "brave/components/brave_rewards/browser/rewards_service.h"
16-
#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h"
16+
#include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
1717
#include "brave/components/brave_shields/browser/ad_block_service.h"
1818
#include "brave/components/brave_shields/common/brave_shield_constants.h"
1919
#include "chrome/browser/profiles/profile.h"
@@ -33,19 +33,19 @@ void EnableAdblockCookieList(base::WeakPtr<Profile> profile) {
3333
}
3434

3535
// Obtrusive cookie notices list in cosmetic filters.
36-
auto* component_service_manager =
37-
g_brave_browser_process->ad_block_service()->component_service_manager();
38-
if (!component_service_manager ||
39-
!component_service_manager->IsFilterListAvailable(
36+
auto* regional_service_manager =
37+
g_brave_browser_process->ad_block_service()->regional_service_manager();
38+
if (!regional_service_manager ||
39+
!regional_service_manager->IsFilterListAvailable(
4040
brave_shields::kCookieListUuid)) {
4141
base::SequencedTaskRunner::GetCurrentDefault()->PostDelayedTask(
4242
FROM_HERE, base::BindOnce(&EnableAdblockCookieList, profile),
4343
base::Seconds(1));
4444
return;
4545
}
4646

47-
component_service_manager->EnableFilterList(brave_shields::kCookieListUuid,
48-
true);
47+
regional_service_manager->EnableFilterList(brave_shields::kCookieListUuid,
48+
true);
4949
}
5050

5151
} // namespace

‎browser/permissions/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ if (!is_android) {
2525
"//brave/browser/brave_wallet",
2626
"//brave/components/brave_component_updater/browser:browser",
2727
"//brave/components/brave_shields/browser:browser",
28-
"//brave/components/brave_shields/browser:test_support",
2928
"//brave/components/brave_shields/common",
3029
"//brave/components/brave_wallet/browser",
3130
"//brave/components/brave_wallet/browser:permission_utils",

‎browser/ui/views/brave_shields/cookie_list_opt_in_browsertest.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "brave/browser/brave_browser_process.h"
1212
#include "brave/browser/perf/brave_perf_switches.h"
1313
#include "brave/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.h"
14-
#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h"
14+
#include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
1515
#include "brave/components/brave_shields/browser/ad_block_service.h"
1616
#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h"
1717
#include "brave/components/brave_shields/common/brave_shield_constants.h"
@@ -38,13 +38,13 @@ namespace brave_shields {
3838

3939
namespace {
4040

41-
auto* GetComponentServiceManager() {
41+
auto* GetRegionalServiceManager() {
4242
return g_brave_browser_process->ad_block_service()
43-
->component_service_manager();
43+
->regional_service_manager();
4444
}
4545

4646
bool IsCookieListFilterEnabled() {
47-
return GetComponentServiceManager()->IsFilterListEnabled(kCookieListUuid);
47+
return GetRegionalServiceManager()->IsFilterListEnabled(kCookieListUuid);
4848
}
4949

5050
class CookieListFilterEnabledObserver {
@@ -127,10 +127,10 @@ class CookieListOptInBrowserTest : public InProcessBrowserTest {
127127
kCookieListUuid,
128128
"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt",
129129
"Easylist-Cookie List - Filter Obtrusive Cookie Notices", {},
130-
"https://forums.lanik.us/", "Removes obtrusive cookie law notices",
131-
false, false, false, 0, kRegionalAdBlockComponentTestId,
132-
kRegionalAdBlockComponentTest64PublicKey, "", "")};
133-
GetComponentServiceManager()->SetFilterListCatalog(filter_list_catalog);
130+
"https://forums.lanik.us/", kRegionalAdBlockComponentTestId,
131+
kRegionalAdBlockComponentTest64PublicKey,
132+
"Removes obtrusive cookie law notices", "", "")};
133+
GetRegionalServiceManager()->SetFilterListCatalog(filter_list_catalog);
134134
}
135135

136136
base::test::ScopedFeatureList scoped_feature_list_;
@@ -248,7 +248,7 @@ class CookieListOptInPreEnabledBrowserTest : public CookieListOptInBrowserTest {
248248
void SetUpLocalState() override {
249249
CookieListOptInBrowserTest::SetUpLocalState();
250250

251-
GetComponentServiceManager()->EnableFilterList(kCookieListUuid, true);
251+
GetRegionalServiceManager()->EnableFilterList(kCookieListUuid, true);
252252

253253
// Since `AdBlockRegionalServiceManager::EnableFilterList` modifies local
254254
// state asynchronously in a posted task, waiting for the update to complete

0 commit comments

Comments
 (0)