diff --git a/.storybook/BUILD.gn b/.storybook/BUILD.gn index 7027f93969e..10748fdffe2 100644 --- a/.storybook/BUILD.gn +++ b/.storybook/BUILD.gn @@ -17,7 +17,7 @@ group("storybook") { deps = [ "//brave/components/brave_new_tab_ui:mojom_js", "//brave/components/brave_news/common:mojom_js", - "//brave/components/brave_shields/common:mojom_js", + "//brave/components/brave_shields/core/common:mojom_js", "//brave/components/brave_vpn/common/mojom:mojom_js", "//brave/components/brave_wallet/common:mojom_js", "//mojo/public/js:bindings", diff --git a/android/android_browser_tests.gni b/android/android_browser_tests.gni index d7b22c8e43e..261af53afcd 100644 --- a/android/android_browser_tests.gni +++ b/android/android_browser_tests.gni @@ -114,7 +114,7 @@ android_test_exception_deps = [ "//brave/browser/ui:browser_tests", "//brave/browser/ui/tabs/test:browser_tests", "//brave/browser/ui/views/tabs:browser_tests", - "//brave/components/brave_shields/browser:test_support", + "//brave/components/brave_shields/content/test:test_support", "//brave/components/brave_wallet/resources:ethereum_provider_generated_resources", "//brave/components/de_amp/browser/test:browser_tests", "//brave/renderer/skus:browser_tests", diff --git a/browser/about_flags.cc b/browser/about_flags.cc index b01fb18e112..f2836f26169 100644 --- a/browser/about_flags.cc +++ b/browser/about_flags.cc @@ -23,7 +23,7 @@ #include "brave/components/brave_player/common/buildflags/buildflags.h" #include "brave/components/brave_rewards/common/buildflags/buildflags.h" #include "brave/components/brave_rewards/common/features.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_sync/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/common/features.h" diff --git a/browser/android/BUILD.gn b/browser/android/BUILD.gn index 8fd36c02d1a..17411a2e5f5 100644 --- a/browser/android/BUILD.gn +++ b/browser/android/BUILD.gn @@ -27,7 +27,7 @@ source_set("android_browser_process") { "//brave/browser/brave_ads/android:jni_headers", "//brave/build/android:jni_headers", "//brave/components/brave_ads/browser", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/brave_sync", "//brave/components/brave_sync:crypto", "//brave/components/brave_sync:prefs", diff --git a/browser/android/brave_shields_content_settings.cc b/browser/android/brave_shields_content_settings.cc index 26a4edf5971..2f5073c0c05 100644 --- a/browser/android/brave_shields_content_settings.cc +++ b/browser/android/brave_shields_content_settings.cc @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "brave/browser/android/brave_shields_content_settings.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include diff --git a/browser/android/preferences/BUILD.gn b/browser/android/preferences/BUILD.gn index 03451850cf7..6e77ecb7a21 100644 --- a/browser/android/preferences/BUILD.gn +++ b/browser/android/preferences/BUILD.gn @@ -22,8 +22,8 @@ source_set("preferences") { "//brave/common", "//brave/components/brave_referrals/common", "//brave/components/brave_rewards/common", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/brave_sync", "//brave/components/p3a", "//components/content_settings/core/browser", @@ -38,7 +38,7 @@ java_cpp_strings("java_pref_names_srcjar") { sources = [ "//brave/components/brave_adaptive_captcha/pref_names.h", "//brave/components/brave_rewards/common/pref_names.h", - "//brave/components/brave_shields/common/pref_names.h", + "//brave/components/brave_shields/core/common/pref_names.h", "//brave/components/brave_vpn/common/pref_names.h", "//brave/components/constants/pref_names.h", "//brave/components/de_amp/common/pref_names.cc", diff --git a/browser/android/preferences/background_video_playback_tab_helper.cc b/browser/android/preferences/background_video_playback_tab_helper.cc index c2c3e804571..fdbdcd95c11 100644 --- a/browser/android/preferences/background_video_playback_tab_helper.cc +++ b/browser/android/preferences/background_video_playback_tab_helper.cc @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "brave/browser/android/preferences/features.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/android/preferences/brave_pref_service_bridge.cc b/browser/android/preferences/brave_pref_service_bridge.cc index 7f3d2d02d7d..5f9d9a5df40 100644 --- a/browser/android/preferences/brave_pref_service_bridge.cc +++ b/browser/android/preferences/brave_pref_service_bridge.cc @@ -11,8 +11,8 @@ #include "brave/components/brave_perf_predictor/common/pref_names.h" #include "brave/components/brave_referrals/common/pref_names.h" #include "brave/components/brave_rewards/common/pref_names.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/brave_sync/brave_sync_prefs.h" #include "brave/components/constants/pref_names.h" #include "brave/components/de_amp/common/pref_names.h" diff --git a/browser/brave_browser_main_extra_parts.cc b/browser/brave_browser_main_extra_parts.cc index 88fe28bbbee..050e36fec22 100644 --- a/browser/brave_browser_main_extra_parts.cc +++ b/browser/brave_browser_main_extra_parts.cc @@ -7,7 +7,7 @@ #include "base/metrics/histogram_macros.h" #include "brave/browser/brave_browser_process_impl.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" #include "brave/components/p3a/buildflags.h" #include "brave/components/p3a/p3a_service.h" #include "components/metrics/metrics_pref_names.h" diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc index 8cff942118c..a7b6a977617 100644 --- a/browser/brave_browser_process_impl.cc +++ b/browser/brave_browser_process_impl.cc @@ -28,10 +28,10 @@ #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" #include "brave/components/brave_referrals/browser/brave_referrals_service.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" -#include "brave/components/brave_shields/browser/brave_farbling_service.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_sync/network_time_helper.h" #include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" #include "brave/components/constants/pref_names.h" diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index be77e1123c6..540e6214156 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -46,12 +46,12 @@ #include "brave/components/brave_search/common/brave_search_default.mojom.h" #include "brave/components/brave_search/common/brave_search_fallback.mojom.h" #include "brave/components/brave_search/common/brave_search_utils.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_farbling_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/browser/domain_block_navigation_throttle.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/domain_block_navigation_throttle.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/brave_wallet_p3a_private.h" #include "brave/components/brave_wallet/browser/brave_wallet_service.h" @@ -232,8 +232,8 @@ using extensions::ChromeContentBrowserClientExtensionsPart; #include "brave/components/brave_rewards/common/features.h" #include "brave/components/brave_rewards/common/mojom/rewards_panel.mojom.h" #include "brave/components/brave_rewards/common/mojom/rewards_tip_panel.mojom.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom.h" #include "brave/components/commands/common/commands.mojom.h" #include "brave/components/commands/common/features.h" #endif diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc index 8860631aa0d..6c933e4fa8a 100644 --- a/browser/brave_content_browser_client_browsertest.cc +++ b/browser/brave_content_browser_client_browsertest.cc @@ -12,7 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "brave/browser/brave_content_browser_client.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc index 16de55f673f..271d83b7d2c 100644 --- a/browser/brave_local_state_prefs.cc +++ b/browser/brave_local_state_prefs.cc @@ -22,8 +22,8 @@ #include "brave/components/brave_ads/browser/ads_service.h" #include "brave/components/brave_referrals/browser/brave_referrals_service.h" #include "brave/components/brave_search_conversion/p3a.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/constants/pref_names.h" diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc index c5383a3ead9..f53059f731c 100644 --- a/browser/brave_prefs_browsertest.cc +++ b/browser/brave_prefs_browsertest.cc @@ -7,8 +7,8 @@ #include "brave/browser/ethereum_remote_client/buildflags/buildflags.h" #include "brave/browser/metrics/buildflags/buildflags.h" #include "brave/components/brave_rewards/common/pref_names.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/pref_names.h" diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 80928600d3f..aa7e797f80a 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -29,9 +29,9 @@ #include "brave/components/brave_search/browser/brave_search_default_host.h" #include "brave/components/brave_search/common/brave_search_utils.h" #include "brave/components/brave_search_conversion/utils.h" -#include "brave/components/brave_shields/browser/brave_farbling_service.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/brave_sync/brave_sync_prefs.h" #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h" #include "brave/components/brave_wayback_machine/buildflags/buildflags.h" diff --git a/browser/brave_shields/ad_block_pref_service_factory.cc b/browser/brave_shields/ad_block_pref_service_factory.cc index a9efc2a1281..b82cc39d67d 100644 --- a/browser/brave_shields/ad_block_pref_service_factory.cc +++ b/browser/brave_shields/ad_block_pref_service_factory.cc @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/ad_block_pref_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_pref_service.h" #include "chrome/browser/net/proxy_service_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index 8d5cff89872..f5063ed1972 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -21,19 +21,19 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/net/brave_ad_block_tp_network_delegate_helper.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_engine.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/browser/engine_test_observer.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" -#include "brave/components/brave_shields/browser/test_filters_provider.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_engine.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/test/engine_test_observer.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "brave/components/de_amp/common/pref_names.h" diff --git a/browser/brave_shields/ad_block_service_browsertest.h b/browser/brave_shields/ad_block_service_browsertest.h index 5dc5182f761..4ccbd57b414 100644 --- a/browser/brave_shields/ad_block_service_browsertest.h +++ b/browser/brave_shields/ad_block_service_browsertest.h @@ -10,7 +10,7 @@ #include #include -#include "brave/components/brave_shields/browser/test_filters_provider.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "content/public/test/content_mock_cert_verifier.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/browser/brave_shields/ad_block_subscription_download_manager_getter.h b/browser/brave_shields/ad_block_subscription_download_manager_getter.h index 6add20012f0..e075f685619 100644 --- a/browser/brave_shields/ad_block_subscription_download_manager_getter.h +++ b/browser/brave_shields/ad_block_subscription_download_manager_getter.h @@ -6,7 +6,7 @@ #ifndef BRAVE_BROWSER_BRAVE_SHIELDS_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_GETTER_H_ #define BRAVE_BROWSER_BRAVE_SHIELDS_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_GETTER_H_ -#include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_manager.h" brave_shields::AdBlockSubscriptionDownloadManager::DownloadManagerGetter AdBlockSubscriptionDownloadManagerGetter(); diff --git a/browser/brave_shields/brave_shields_web_contents_observer.cc b/browser/brave_shields/brave_shields_web_contents_observer.cc index 139a46edfe2..8de7836d2f3 100644 --- a/browser/brave_shields/brave_shields_web_contents_observer.cc +++ b/browser/brave_shields/brave_shields_web_contents_observer.cc @@ -14,9 +14,9 @@ #include "base/feature_list.h" #include "base/strings/utf_string_conversions.h" #include "brave/components/brave_perf_predictor/browser/perf_predictor_tab_helper.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/renderer_configuration.mojom.h" diff --git a/browser/brave_shields/brave_shields_web_contents_observer.h b/browser/brave_shields/brave_shields_web_contents_observer.h index 7901c142382..552bc7bffb4 100644 --- a/browser/brave_shields/brave_shields_web_contents_observer.h +++ b/browser/brave_shields/brave_shields_web_contents_observer.h @@ -13,7 +13,7 @@ #include "base/containers/flat_map.h" #include "base/synchronization/lock.h" -#include "brave/components/brave_shields/common/brave_shields.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields.mojom.h" #include "content/public/browser/render_frame_host_receiver_set.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/browser/brave_shields/cookie_list_opt_in_service_factory.cc b/browser/brave_shields/cookie_list_opt_in_service_factory.cc index 392f6925c50..1fea9ab9565 100644 --- a/browser/brave_shields/cookie_list_opt_in_service_factory.cc +++ b/browser/brave_shields/cookie_list_opt_in_service_factory.cc @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/cookie_list_opt_in_service.h" +#include "brave/components/brave_shields/content/browser/cookie_list_opt_in_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/browser/brave_shields/cookie_list_opt_in_service_factory.h b/browser/brave_shields/cookie_list_opt_in_service_factory.h index 8e5ce3c147a..186616888c7 100644 --- a/browser/brave_shields/cookie_list_opt_in_service_factory.h +++ b/browser/brave_shields/cookie_list_opt_in_service_factory.h @@ -6,7 +6,7 @@ #ifndef BRAVE_BROWSER_BRAVE_SHIELDS_COOKIE_LIST_OPT_IN_SERVICE_FACTORY_H_ #define BRAVE_BROWSER_BRAVE_SHIELDS_COOKIE_LIST_OPT_IN_SERVICE_FACTORY_H_ -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/browser_context.h" diff --git a/browser/brave_shields/cookie_pref_service_browsertest.cc b/browser/brave_shields/cookie_pref_service_browsertest.cc index 8358658727b..36276345efe 100644 --- a/browser/brave_shields/cookie_pref_service_browsertest.cc +++ b/browser/brave_shields/cookie_pref_service_browsertest.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/brave_shields/domain_block_page_browsertest.cc b/browser/brave_shields/domain_block_page_browsertest.cc index 017f9b52ba5..dc3e6e665eb 100644 --- a/browser/brave_shields/domain_block_page_browsertest.cc +++ b/browser/brave_shields/domain_block_page_browsertest.cc @@ -8,10 +8,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" diff --git a/browser/brave_shields/eventsource_pool_limit_browsertest.cc b/browser/brave_shields/eventsource_pool_limit_browsertest.cc index 24fa451a86e..adbb89035be 100644 --- a/browser/brave_shields/eventsource_pool_limit_browsertest.cc +++ b/browser/brave_shields/eventsource_pool_limit_browsertest.cc @@ -7,7 +7,7 @@ #include #include "base/path_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/brave_shields/filter_list_service_factory.cc b/browser/brave_shields/filter_list_service_factory.cc index 7ffac8fc84b..9431e7adfd9 100644 --- a/browser/brave_shields/filter_list_service_factory.cc +++ b/browser/brave_shields/filter_list_service_factory.cc @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/filter_list_service.h" +#include "brave/components/brave_shields/content/browser/filter_list_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/browser/brave_shields/filter_list_service_factory.h b/browser/brave_shields/filter_list_service_factory.h index ceb188ae840..3a050d7bf72 100644 --- a/browser/brave_shields/filter_list_service_factory.h +++ b/browser/brave_shields/filter_list_service_factory.h @@ -6,7 +6,7 @@ #ifndef BRAVE_BROWSER_BRAVE_SHIELDS_FILTER_LIST_SERVICE_FACTORY_H_ #define BRAVE_BROWSER_BRAVE_SHIELDS_FILTER_LIST_SERVICE_FACTORY_H_ -#include "brave/components/brave_shields/common/filter_list.mojom.h" +#include "brave/components/brave_shields/core/common/filter_list.mojom.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/browser_context.h" diff --git a/browser/brave_shields/https_upgrade_browsertest.cc b/browser/brave_shields/https_upgrade_browsertest.cc index cc3e7464013..6a448889871 100644 --- a/browser/brave_shields/https_upgrade_browsertest.cc +++ b/browser/brave_shields/https_upgrade_browsertest.cc @@ -5,7 +5,7 @@ #include "base/test/scoped_feature_list.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/https_upgrade_exceptions/browser/https_upgrade_exceptions_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/brave_shields/sources.gni b/browser/brave_shields/sources.gni index 05f613e9cdf..478f0dbf572 100644 --- a/browser/brave_shields/sources.gni +++ b/browser/brave_shields/sources.gni @@ -21,8 +21,8 @@ brave_browser_brave_shields_deps = [ "//brave/browser:browser_process", "//brave/common", "//brave/components/brave_perf_predictor/browser", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/constants", "//chrome/browser/profiles:profile", "//chrome/common", diff --git a/browser/brave_shields/websockets_pool_limit_browsertest.cc b/browser/brave_shields/websockets_pool_limit_browsertest.cc index b8a7e3b95e3..08ad5479bdf 100644 --- a/browser/brave_shields/websockets_pool_limit_browsertest.cc +++ b/browser/brave_shields/websockets_pool_limit_browsertest.cc @@ -6,7 +6,7 @@ #include #include "base/path_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc index d7d0c328555..f24fbef21fc 100644 --- a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc +++ b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc @@ -10,8 +10,8 @@ #include #include "base/functional/bind.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/test/base/testing_profile.h" diff --git a/browser/debounce/debounce_browsertest.cc b/browser/debounce/debounce_browsertest.cc index 9e60063584d..bc0c6ce4f68 100644 --- a/browser/debounce/debounce_browsertest.cc +++ b/browser/debounce/debounce_browsertest.cc @@ -11,10 +11,10 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/browser/engine_test_observer.h" -#include "brave/components/brave_shields/browser/test_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/test/engine_test_observer.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" #include "brave/components/debounce/core/browser/debounce_component_installer.h" #include "brave/components/debounce/core/common/features.h" #include "brave/components/debounce/core/common/pref_names.h" diff --git a/browser/ephemeral_storage/BUILD.gn b/browser/ephemeral_storage/BUILD.gn index f8cff6760ce..94230091874 100644 --- a/browser/ephemeral_storage/BUILD.gn +++ b/browser/ephemeral_storage/BUILD.gn @@ -26,9 +26,9 @@ source_set("browser_tests") { deps += [ "//brave/browser", "//brave/components/brave_component_updater/browser", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/browser:test_support", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/content/test:test_support", + "//brave/components/brave_shields/core/common", "//brave/components/ephemeral_storage", "//chrome/browser", "//chrome/browser/ui", diff --git a/browser/ephemeral_storage/blob_url_browsertest.cc b/browser/ephemeral_storage/blob_url_browsertest.cc index e448bdf6060..f77259fecb1 100644 --- a/browser/ephemeral_storage/blob_url_browsertest.cc +++ b/browser/ephemeral_storage/blob_url_browsertest.cc @@ -8,7 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/strings/pattern.h" #include "brave/browser/ephemeral_storage/ephemeral_storage_browsertest.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_enums.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/browser/ephemeral_storage/brave_ephemeral_storage_service_delegate.cc b/browser/ephemeral_storage/brave_ephemeral_storage_service_delegate.cc index 1c846508251..6b662a9bbdb 100644 --- a/browser/ephemeral_storage/brave_ephemeral_storage_service_delegate.cc +++ b/browser/ephemeral_storage/brave_ephemeral_storage_service_delegate.cc @@ -7,7 +7,7 @@ #include -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "content/public/browser/browser_context.h" diff --git a/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc index 8d57ef40856..4ec89625ab9 100644 --- a/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc +++ b/browser/ephemeral_storage/ephemeral_storage_1p_browsertest.cc @@ -5,7 +5,7 @@ #include "brave/browser/ephemeral_storage/ephemeral_storage_browsertest.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_enums.h" diff --git a/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc index b54a34a27a4..0c15e779a5e 100644 --- a/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc +++ b/browser/ephemeral_storage/ephemeral_storage_1p_domain_block_browsertest.cc @@ -10,11 +10,11 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/browser/engine_test_observer.h" -#include "brave/components/brave_shields/browser/test_filters_provider.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/test/engine_test_observer.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" +#include "brave/components/brave_shields/core/common/features.h" #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc index 378aa8d2fd6..179a31bbdd6 100644 --- a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc +++ b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc @@ -17,8 +17,8 @@ #include "base/time/time.h" #include "brave/browser/ephemeral_storage/ephemeral_storage_service_factory.h" #include "brave/browser/ephemeral_storage/ephemeral_storage_tab_helper.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/ephemeral_storage/ephemeral_storage_service.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" diff --git a/browser/ephemeral_storage/ephemeral_storage_forget_by_default_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_forget_by_default_browsertest.cc index 1892d010de8..f8cc752d4f5 100644 --- a/browser/ephemeral_storage/ephemeral_storage_forget_by_default_browsertest.cc +++ b/browser/ephemeral_storage/ephemeral_storage_forget_by_default_browsertest.cc @@ -5,7 +5,7 @@ #include "brave/browser/ephemeral_storage/ephemeral_storage_browsertest.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc b/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc index adc7c621cb5..928089f6c34 100644 --- a/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc +++ b/browser/ephemeral_storage/ephemeral_storage_tab_helper.cc @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/hash/md5.h" #include "brave/browser/ephemeral_storage/ephemeral_storage_service_factory.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/ephemeral_storage/ephemeral_storage_service.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/ephemeral_storage/hsts_partitioning_browsertest.cc b/browser/ephemeral_storage/hsts_partitioning_browsertest.cc index 5927c019353..1358e6a49ad 100644 --- a/browser/ephemeral_storage/hsts_partitioning_browsertest.cc +++ b/browser/ephemeral_storage/hsts_partitioning_browsertest.cc @@ -8,7 +8,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/test/bind.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/browser/extensions/BUILD.gn b/browser/extensions/BUILD.gn index 3683f6e39d0..05a03c7e46b 100644 --- a/browser/extensions/BUILD.gn +++ b/browser/extensions/BUILD.gn @@ -69,8 +69,8 @@ source_set("extensions") { "//brave/components/brave_rewards/browser", "//brave/components/brave_rewards/common", "//brave/components/brave_rewards/core:headers", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/brave_vpn/common/buildflags", "//brave/components/brave_wallet/browser:utils", "//brave/components/brave_wallet/common", diff --git a/browser/extensions/api/brave_shields_api.cc b/browser/extensions/api/brave_shields_api.cc index 1e97d36e5df..21efd30ad0b 100644 --- a/browser/extensions/api/brave_shields_api.cc +++ b/browser/extensions/api/brave_shields_api.cc @@ -11,8 +11,8 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/ui/brave_pages.h" #include "brave/common/extensions/api/brave_shields.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index 7e71c440638..9811d33753f 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -12,8 +12,8 @@ #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/common/pref_names.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wayback_machine/buildflags/buildflags.h" diff --git a/browser/farbling/BUILD.gn b/browser/farbling/BUILD.gn index 7a715e6ecce..1afac8094f9 100644 --- a/browser/farbling/BUILD.gn +++ b/browser/farbling/BUILD.gn @@ -32,8 +32,8 @@ if (!is_android) { "//brave/browser", "//brave/common:common", "//brave/components/brave_component_updater/browser:browser", - "//brave/components/brave_shields/browser:browser", - "//brave/components/brave_shields/common:common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/constants", "//chrome/browser", "//chrome/browser/ui", diff --git a/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc b/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc index 8bca8eab7c0..bb05ada394b 100644 --- a/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc +++ b/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc @@ -11,8 +11,8 @@ #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc b/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc index 58af1c556ec..3987e603832 100644 --- a/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc +++ b/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc @@ -10,7 +10,7 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_font_whitelist_browsertest.cc b/browser/farbling/brave_font_whitelist_browsertest.cc index 29b11a985b4..2311d388355 100644 --- a/browser/farbling/brave_font_whitelist_browsertest.cc +++ b/browser/farbling/brave_font_whitelist_browsertest.cc @@ -6,7 +6,7 @@ #include #include "base/test/scoped_feature_list.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/content_settings/renderer/brave_content_settings_agent_impl.h" #include "brave/third_party/blink/renderer/brave_font_whitelist.h" #include "content/public/renderer/render_frame.h" diff --git a/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc b/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc index 6e839be49cc..90755925f13 100644 --- a/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc @@ -10,7 +10,7 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc b/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc index 396cac3280c..86438a08d23 100644 --- a/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc @@ -11,7 +11,7 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_navigator_keyboard_api_browsertest.cc b/browser/farbling/brave_navigator_keyboard_api_browsertest.cc index eab7f003e93..1e4a01c6771 100644 --- a/browser/farbling/brave_navigator_keyboard_api_browsertest.cc +++ b/browser/farbling/brave_navigator_keyboard_api_browsertest.cc @@ -7,7 +7,7 @@ #include "base/containers/contains.h" #include "base/path_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/farbling/brave_navigator_languages_farbling_browsertest.cc b/browser/farbling/brave_navigator_languages_farbling_browsertest.cc index e89a7410d73..ddcb70fecff 100644 --- a/browser/farbling/brave_navigator_languages_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_languages_farbling_browsertest.cc @@ -11,9 +11,9 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_farbling_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc b/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc index 717768a5da7..d61d7c0dc5d 100644 --- a/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc @@ -10,7 +10,7 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_navigator_usb_farbling_browsertest.cc b/browser/farbling/brave_navigator_usb_farbling_browsertest.cc index 64afbb39736..409ec541136 100644 --- a/browser/farbling/brave_navigator_usb_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_usb_farbling_browsertest.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "brave/browser/brave_content_browser_client.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc b/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc index 87effaf3ad6..1d2eb95d5f7 100644 --- a/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc @@ -12,8 +12,8 @@ #include "base/version.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc b/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc index 8f7ae9f171d..66dfff89584 100644 --- a/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc +++ b/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_screen_farbling_browsertest.cc b/browser/farbling/brave_screen_farbling_browsertest.cc index 16a6e8dbf97..a3fc2ee2b36 100644 --- a/browser/farbling/brave_screen_farbling_browsertest.cc +++ b/browser/farbling/brave_screen_farbling_browsertest.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/chrome_test_extension_loader.h" diff --git a/browser/farbling/brave_speech_synthesis_farbling_browsertest.cc b/browser/farbling/brave_speech_synthesis_farbling_browsertest.cc index 11c63005ea9..1555a6b071a 100644 --- a/browser/farbling/brave_speech_synthesis_farbling_browsertest.cc +++ b/browser/farbling/brave_speech_synthesis_farbling_browsertest.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/farbling/brave_webaudio_farbling_browsertest.cc b/browser/farbling/brave_webaudio_farbling_browsertest.cc index 4da56ae57d1..d0a0a62897f 100644 --- a/browser/farbling/brave_webaudio_farbling_browsertest.cc +++ b/browser/farbling/brave_webaudio_farbling_browsertest.cc @@ -10,7 +10,7 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/farbling/brave_webgl_farbling_browsertest.cc b/browser/farbling/brave_webgl_farbling_browsertest.cc index 051c6fede3e..804eb240817 100644 --- a/browser/farbling/brave_webgl_farbling_browsertest.cc +++ b/browser/farbling/brave_webgl_farbling_browsertest.cc @@ -11,7 +11,7 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/net/BUILD.gn b/browser/net/BUILD.gn index 04b80415c6e..c749e7dcc07 100644 --- a/browser/net/BUILD.gn +++ b/browser/net/BUILD.gn @@ -75,8 +75,8 @@ source_set("net") { "//brave/components/brave_ads/browser", "//brave/components/brave_component_updater/browser", "//brave/components/brave_referrals/browser", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/brave_wallet/browser", "//brave/components/brave_wallet/common", "//brave/components/brave_webtorrent/browser/buildflags", @@ -148,8 +148,8 @@ source_set("browser_tests") { ] deps = [ "//brave/browser/net", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/query_filter", "//brave/components/tor/buildflags", "//chrome/browser", @@ -201,8 +201,8 @@ source_set("unit_tests") { "//brave/components/brave_component_updater/browser", "//brave/components/brave_rewards/common", "//brave/components/brave_rewards/common:features", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/browser:test_support", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/content/test:test_support", "//brave/components/l10n/common:test_support", "//chrome/test:test_support", "//content/test:test_support", diff --git a/browser/net/brave_ad_block_csp_network_delegate_helper.cc b/browser/net/brave_ad_block_csp_network_delegate_helper.cc index 5921db4b465..93ebb078e5c 100644 --- a/browser/net/brave_ad_block_csp_network_delegate_helper.cc +++ b/browser/net/brave_ad_block_csp_network_delegate_helper.cc @@ -10,8 +10,8 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/net/url_context.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" #include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper.cc b/browser/net/brave_ad_block_tp_network_delegate_helper.cc index 670afd230a6..f7f49db636c 100644 --- a/browser/net/brave_ad_block_tp_network_delegate_helper.cc +++ b/browser/net/brave_ad_block_tp_network_delegate_helper.cc @@ -19,10 +19,10 @@ #include "brave/browser/brave_shields/brave_shields_web_contents_observer.h" #include "brave/browser/net/url_context.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_pref_service.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_pref_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/url_constants.h" #include "chrome/browser/net/secure_dns_config.h" #include "chrome/browser/net/system_network_context_manager.h" diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc b/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc index 2e9b00f6d50..5fcf76b14bd 100644 --- a/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc +++ b/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc @@ -15,9 +15,9 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/net/url_context.h" #include "brave/components/brave_component_updater/browser/brave_component.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" -#include "brave/components/brave_shields/browser/test_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" #include "brave/test/base/testing_brave_browser_process.h" #include "chrome/browser/net/system_network_context_manager.h" #include "chrome/common/chrome_paths.h" diff --git a/browser/net/brave_network_delegate_browsertest.cc b/browser/net/brave_network_delegate_browsertest.cc index 97d8486aa75..6e52cd20b22 100644 --- a/browser/net/brave_network_delegate_browsertest.cc +++ b/browser/net/brave_network_delegate_browsertest.cc @@ -6,8 +6,8 @@ #include "base/path_service.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc b/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc index 7a59c2098d6..938acdc82ad 100644 --- a/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc +++ b/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/constants/brave_paths.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/net/brave_proxying_url_loader_factory.cc b/browser/net/brave_proxying_url_loader_factory.cc index b779e801b90..77517492ed1 100644 --- a/browser/net/brave_proxying_url_loader_factory.cc +++ b/browser/net/brave_proxying_url_loader_factory.cc @@ -14,8 +14,8 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "brave/browser/net/brave_request_handler.h" -#include "brave/components/brave_shields/browser/adblock_stub_response.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/adblock_stub_response.h" +#include "brave/components/brave_shields/core/common/features.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/browser/net/brave_reduce_language_network_delegate_helper.cc b/browser/net/brave_reduce_language_network_delegate_helper.cc index fa01c1f5aee..b1f8df70652 100644 --- a/browser/net/brave_reduce_language_network_delegate_helper.cc +++ b/browser/net/brave_reduce_language_network_delegate_helper.cc @@ -13,8 +13,8 @@ #include "base/containers/fixed_flat_set.h" #include "base/strings/string_split.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/brave_farbling_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/content_settings/core/browser/host_content_settings_map.h" diff --git a/browser/net/brave_request_handler.cc b/browser/net/brave_request_handler.cc index b64ce7a8b0a..fd9d84eb05d 100644 --- a/browser/net/brave_request_handler.cc +++ b/browser/net/brave_request_handler.cc @@ -21,7 +21,7 @@ #include "brave/browser/net/brave_stp_util.h" #include "brave/browser/net/decentralized_dns_network_delegate_helper.h" #include "brave/browser/net/global_privacy_control_network_delegate_helper.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" #include "brave/components/constants/pref_names.h" #include "brave/components/ipfs/buildflags/buildflags.h" diff --git a/browser/net/brave_site_hacks_network_delegate_helper.cc b/browser/net/brave_site_hacks_network_delegate_helper.cc index 2e7078513b1..7f7dc816005 100644 --- a/browser/net/brave_site_hacks_network_delegate_helper.cc +++ b/browser/net/brave_site_hacks_network_delegate_helper.cc @@ -10,7 +10,7 @@ #include #include "base/metrics/histogram_macros.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/url_constants.h" #include "brave/components/query_filter/utils.h" #include "content/public/common/referrer.h" diff --git a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc index ca98ca2995f..1adc05adb64 100644 --- a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc +++ b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/tor/buildflags/buildflags.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/net/url_context.cc b/browser/net/url_context.cc index 5c3a0c7be02..37c59853117 100644 --- a/browser/net/url_context.cc +++ b/browser/net/url_context.cc @@ -9,7 +9,7 @@ #include #include "brave/browser/brave_shields/brave_shields_web_contents_observer.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" #include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #include "brave/components/ipfs/buildflags/buildflags.h" diff --git a/browser/perf/brave_perf_features_processor.cc b/browser/perf/brave_perf_features_processor.cc index 79c67cac943..abd620a9885 100644 --- a/browser/perf/brave_perf_features_processor.cc +++ b/browser/perf/brave_perf_features_processor.cc @@ -13,9 +13,9 @@ #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_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "components/prefs/pref_service.h" diff --git a/browser/perf/sources.gni b/browser/perf/sources.gni index cfb13623762..cc5ed6dda16 100644 --- a/browser/perf/sources.gni +++ b/browser/perf/sources.gni @@ -15,8 +15,9 @@ brave_browser_perf_deps = [ "//base", "//brave/components/brave_ads/core", "//brave/components/brave_rewards/browser", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common/", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/browser", + "//brave/components/brave_shields/core/common/", "//components/prefs", ] diff --git a/browser/permissions/BUILD.gn b/browser/permissions/BUILD.gn index 87726ba0742..13deb4b813f 100644 --- a/browser/permissions/BUILD.gn +++ b/browser/permissions/BUILD.gn @@ -24,9 +24,9 @@ if (!is_android) { "//brave/browser", "//brave/browser/brave_wallet", "//brave/components/brave_component_updater/browser:browser", - "//brave/components/brave_shields/browser:browser", - "//brave/components/brave_shields/browser:test_support", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/content/test:test_support", + "//brave/components/brave_shields/core/common", "//brave/components/brave_wallet/browser", "//brave/components/brave_wallet/browser:permission_utils", "//brave/components/brave_wallet/common", diff --git a/browser/permissions/google_sign_in_permission_browsertest.cc b/browser/permissions/google_sign_in_permission_browsertest.cc index 13abe06015b..8a62867c95f 100644 --- a/browser/permissions/google_sign_in_permission_browsertest.cc +++ b/browser/permissions/google_sign_in_permission_browsertest.cc @@ -5,8 +5,8 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "brave/components/google_sign_in_permission/features.h" diff --git a/browser/permissions/localhost_access_permission_browsertest.cc b/browser/permissions/localhost_access_permission_browsertest.cc index 99bc1216a68..9c0f6407d91 100644 --- a/browser/permissions/localhost_access_permission_browsertest.cc +++ b/browser/permissions/localhost_access_permission_browsertest.cc @@ -9,10 +9,10 @@ #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/browser/test_filters_provider.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/localhost_permission/localhost_permission_component.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/profiles/profile_util.cc b/browser/profiles/profile_util.cc index b2ff9c7f23b..d35a38bba8d 100644 --- a/browser/profiles/profile_util.cc +++ b/browser/profiles/profile_util.cc @@ -11,8 +11,8 @@ #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" -#include "brave/components/brave_shields/common/brave_shield_utils.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/core/common/brave_shield_utils.h" #include "brave/components/constants/brave_constants.h" #include "brave/components/constants/pref_names.h" #include "brave/components/ntp_background_images/common/pref_names.h" diff --git a/browser/psst/BUILD.gn b/browser/psst/BUILD.gn index 99ad7a826f7..2e231b515e3 100644 --- a/browser/psst/BUILD.gn +++ b/browser/psst/BUILD.gn @@ -11,7 +11,7 @@ source_set("browser_tests") { deps = [ "//base", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/cosmetic_filters/browser", "//brave/components/psst/browser/core", "//brave/components/psst/common", diff --git a/browser/request_otr/BUILD.gn b/browser/request_otr/BUILD.gn index 2dc2d458360..7a1f3524beb 100644 --- a/browser/request_otr/BUILD.gn +++ b/browser/request_otr/BUILD.gn @@ -18,8 +18,8 @@ source_set("browser_tests") { "//brave/browser", "//brave/common:common", "//brave/components/brave_component_updater/browser:browser", - "//brave/components/brave_shields/browser:browser", - "//brave/components/brave_shields/common:common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", "//brave/components/request_otr/browser", "//brave/components/request_otr/common", "//chrome/browser", diff --git a/browser/request_otr/request_otr_browsertest.cc b/browser/request_otr/request_otr_browsertest.cc index 7828c2cfeba..dc7302175e2 100644 --- a/browser/request_otr/request_otr_browsertest.cc +++ b/browser/request_otr/request_otr_browsertest.cc @@ -14,8 +14,8 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/request_otr/browser/request_otr_component_installer.h" #include "brave/components/request_otr/browser/request_otr_service.h" diff --git a/browser/sources.gni b/browser/sources.gni index e9bf9f05f34..914d350d430 100644 --- a/browser/sources.gni +++ b/browser/sources.gni @@ -153,8 +153,8 @@ brave_chrome_browser_deps = [ "//brave/components/brave_search/browser", "//brave/components/brave_search/common", "//brave/components/brave_search/common:mojom", - "//brave/components/brave_shields/common", - "//brave/components/brave_shields/common:mojom", + "//brave/components/brave_shields/core/common", + "//brave/components/brave_shields/core/common:mojom", "//brave/components/brave_sync", "//brave/components/brave_sync:features", "//brave/components/brave_sync:network_time_helper", diff --git a/browser/sync/brave_sync_client_unittest.cc b/browser/sync/brave_sync_client_unittest.cc index ae339ac21cc..8f736908333 100644 --- a/browser/sync/brave_sync_client_unittest.cc +++ b/browser/sync/brave_sync_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/ranges/algorithm.h" #include "brave/components/brave_component_updater/browser/brave_component.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" #include "brave/test/base/testing_brave_browser_process.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/tor/BUILD.gn b/browser/tor/BUILD.gn index 12786cfa150..2f8901322ee 100644 --- a/browser/tor/BUILD.gn +++ b/browser/tor/BUILD.gn @@ -111,7 +111,7 @@ source_set("browser_tests") { "//brave/common", "//brave/components/brave_ads/browser", "//brave/components/brave_component_updater/browser", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/constants", "//brave/components/ipfs/buildflags", "//brave/components/l10n/common", diff --git a/browser/tor/brave_tor_browsertest.cc b/browser/tor/brave_tor_browsertest.cc index c34836a47f9..9705c73f7ac 100644 --- a/browser/tor/brave_tor_browsertest.cc +++ b/browser/tor/brave_tor_browsertest.cc @@ -23,7 +23,7 @@ #include "brave/browser/tor/tor_profile_service_factory.h" #include "brave/browser/ui/webui/brave_settings_ui.h" #include "brave/components/brave_component_updater/browser/brave_component.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "brave/components/tor/brave_tor_client_updater.h" diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index ec4d236be94..eb52969297b 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -32,7 +32,8 @@ source_set("ui") { "//chrome/browser/ui/webui:configs", ] - deps = [] + deps = [ "//brave/components/brave_shields/core/browser" ] + public_deps = [] sources = [ "webui/brave_adblock_internals_ui.cc", @@ -547,9 +548,9 @@ source_set("ui") { "//brave/components/brave_rewards/resources:page_generated_resources", "//brave/components/brave_search/common", "//brave/components/brave_search_conversion", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/common", - "//brave/components/brave_shields/common:mojom", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/common", + "//brave/components/brave_shields/core/common:mojom", "//brave/components/brave_sync:crypto", "//brave/components/brave_sync:prefs", "//brave/components/brave_sync:time_limited_codes", diff --git a/browser/ui/brave_shields_data_controller.cc b/browser/ui/brave_shields_data_controller.cc index 2c139043cb5..d250a6dc354 100644 --- a/browser/ui/brave_shields_data_controller.cc +++ b/browser/ui/brave_shields_data_controller.cc @@ -10,8 +10,8 @@ #include #include "brave/browser/brave_shields/brave_shields_web_contents_observer.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/ui/brave_shields_data_controller.h b/browser/ui/brave_shields_data_controller.h index fc91d7a5a8d..76b0a3fc748 100644 --- a/browser/ui/brave_shields_data_controller.h +++ b/browser/ui/brave_shields_data_controller.h @@ -13,7 +13,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" #include "base/scoped_observation.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" #include "components/content_settings/core/browser/content_settings_observer.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/favicon/core/favicon_driver_observer.h" diff --git a/browser/ui/brave_shields_data_controller_unittest.cc b/browser/ui/brave_shields_data_controller_unittest.cc index 596e7a3498a..2f6cb1097eb 100644 --- a/browser/ui/brave_shields_data_controller_unittest.cc +++ b/browser/ui/brave_shields_data_controller_unittest.cc @@ -7,10 +7,10 @@ #include "base/memory/raw_ptr.h" #include "brave/browser/ui/brave_shields_data_controller.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/features.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/browser/ui/views/brave_shields/cookie_list_opt_in_browsertest.cc b/browser/ui/views/brave_shields/cookie_list_opt_in_browsertest.cc index 36cbd03e642..dfe3647b3cd 100644 --- a/browser/ui/views/brave_shields/cookie_list_opt_in_browsertest.cc +++ b/browser/ui/views/brave_shields/cookie_list_opt_in_browsertest.cc @@ -11,12 +11,12 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/perf/brave_perf_switches.h" #include "brave/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/ui/browser.h" diff --git a/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc b/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc index e8158b14e1f..612933e9d96 100644 --- a/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc +++ b/browser/ui/views/brave_shields/cookie_list_opt_in_bubble_host.cc @@ -12,11 +12,11 @@ #include "base/metrics/histogram_functions.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/constants/webui_url_constants.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run.h" diff --git a/browser/ui/webui/brave_adblock_internals_ui.cc b/browser/ui/webui/brave_adblock_internals_ui.cc index 4f8d01e3be6..a74c6915244 100644 --- a/browser/ui/webui/brave_adblock_internals_ui.cc +++ b/browser/ui/webui/brave_adblock_internals_ui.cc @@ -17,7 +17,7 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/ui/webui/brave_webui_source.h" #include "brave/components/brave_adblock/adblock_internals/resources/grit/brave_adblock_internals_generated_map.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" #include "components/grit/brave_components_resources.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_controller.h" diff --git a/browser/ui/webui/brave_adblock_ui.cc b/browser/ui/webui/brave_adblock_ui.cc index ece19e63e6c..25c10949804 100644 --- a/browser/ui/webui/brave_adblock_ui.cc +++ b/browser/ui/webui/brave_adblock_ui.cc @@ -13,12 +13,12 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/ui/webui/brave_webui_source.h" #include "brave/components/brave_adblock/resources/grit/brave_adblock_generated_map.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" #include "brave/components/constants/webui_url_constants.h" #include "build/build_config.h" #include "components/grit/brave_components_resources.h" diff --git a/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.cc b/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.cc index feb3cf5e7f3..82e7a89d84f 100644 --- a/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.cc +++ b/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.cc @@ -9,9 +9,9 @@ #include "base/metrics/histogram_functions.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" CookieListOptInPageHandler::CookieListOptInPageHandler( mojo::PendingReceiver diff --git a/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.h b/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.h index 03537e9f3c4..75a7e5696c6 100644 --- a/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.h +++ b/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.h @@ -8,7 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "ui/webui/mojo_bubble_web_ui_controller.h" diff --git a/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.cc b/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.cc index 6fb7bb59c9d..716a4ac8cbb 100644 --- a/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.cc +++ b/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.cc @@ -10,7 +10,7 @@ #include "base/feature_list.h" #include "brave/browser/ui/webui/brave_shields/cookie_list_opt_in_page_handler.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_shields/resources/cookie_list_opt_in/grit/cookie_list_opt_in_generated_map.h" #include "brave/components/constants/webui_url_constants.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.h b/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.h index 2de041d0f55..44dee04c108 100644 --- a/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.h +++ b/browser/ui/webui/brave_shields/cookie_list_opt_in_ui.h @@ -9,7 +9,7 @@ #include #include -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "ui/webui/mojo_bubble_web_ui_controller.h" diff --git a/browser/ui/webui/brave_shields/shields_panel_data_handler.h b/browser/ui/webui/brave_shields/shields_panel_data_handler.h index 9da7906f6b9..c8c16fd5895 100644 --- a/browser/ui/webui/brave_shields/shields_panel_data_handler.h +++ b/browser/ui/webui/brave_shields/shields_panel_data_handler.h @@ -11,7 +11,7 @@ #include "base/memory/raw_ptr.h" #include "brave/browser/ui/brave_shields_data_controller.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" diff --git a/browser/ui/webui/brave_shields/shields_panel_handler.cc b/browser/ui/webui/brave_shields/shields_panel_handler.cc index c817d651d45..a14fd614469 100644 --- a/browser/ui/webui/brave_shields/shields_panel_handler.cc +++ b/browser/ui/webui/brave_shields/shields_panel_handler.cc @@ -8,7 +8,7 @@ #include #include "brave/browser/ui/brave_browser_window.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/ui/webui/brave_shields/shields_panel_handler.h b/browser/ui/webui/brave_shields/shields_panel_handler.h index c55c14b07eb..51c2a841f4b 100644 --- a/browser/ui/webui/brave_shields/shields_panel_handler.h +++ b/browser/ui/webui/brave_shields/shields_panel_handler.h @@ -6,7 +6,7 @@ #ifndef BRAVE_BROWSER_UI_WEBUI_BRAVE_SHIELDS_SHIELDS_PANEL_HANDLER_H_ #define BRAVE_BROWSER_UI_WEBUI_BRAVE_SHIELDS_SHIELDS_PANEL_HANDLER_H_ -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" diff --git a/browser/ui/webui/brave_shields/shields_panel_ui.cc b/browser/ui/webui/brave_shields/shields_panel_ui.cc index 8b39386a80e..06e1c49aeb8 100644 --- a/browser/ui/webui/brave_shields/shields_panel_ui.cc +++ b/browser/ui/webui/brave_shields/shields_panel_ui.cc @@ -8,9 +8,9 @@ #include #include "brave/browser/ui/brave_browser_window.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_localized_strings.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_localized_strings.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_shields/resources/panel/grit/brave_shields_panel_generated_map.h" #include "brave/components/constants/pref_names.h" #include "brave/components/constants/webui_url_constants.h" diff --git a/browser/ui/webui/brave_shields/shields_panel_ui.h b/browser/ui/webui/brave_shields/shields_panel_ui.h index e6042da51e9..014d1bf7c60 100644 --- a/browser/ui/webui/brave_shields/shields_panel_ui.h +++ b/browser/ui/webui/brave_shields/shields_panel_ui.h @@ -11,7 +11,7 @@ #include "brave/browser/ui/webui/brave_shields/shields_panel_data_handler.h" #include "brave/browser/ui/webui/brave_shields/shields_panel_handler.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "ui/webui/mojo_bubble_web_ui_controller.h" diff --git a/browser/ui/webui/brave_web_ui_controller_factory.cc b/browser/ui/webui/brave_web_ui_controller_factory.cc index 74d0ab0fc0f..fe012671ba9 100644 --- a/browser/ui/webui/brave_web_ui_controller_factory.cc +++ b/browser/ui/webui/brave_web_ui_controller_factory.cc @@ -21,7 +21,7 @@ #include "brave/components/brave_federated/features.h" #include "brave/components/brave_player/common/buildflags/buildflags.h" #include "brave/components/brave_rewards/common/rewards_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_wallet/common/common_utils.h" #include "brave/components/constants/pref_names.h" #include "brave/components/constants/webui_url_constants.h" diff --git a/browser/ui/webui/settings/BUILD.gn b/browser/ui/webui/settings/BUILD.gn index e5679d0aea1..adc9b09e6ba 100644 --- a/browser/ui/webui/settings/BUILD.gn +++ b/browser/ui/webui/settings/BUILD.gn @@ -15,7 +15,7 @@ source_set("unittests") { deps = [ "//base/test:test_support", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/resources:strings_grit", "//chrome/browser", "//chrome/browser/ui", diff --git a/browser/ui/webui/settings/brave_adblock_handler.cc b/browser/ui/webui/settings/brave_adblock_handler.cc index 95725f7a223..3e2d42a3657 100644 --- a/browser/ui/webui/settings/brave_adblock_handler.cc +++ b/browser/ui/webui/settings/brave_adblock_handler.cc @@ -14,9 +14,9 @@ #include "base/values.h" #include "brave/browser/brave_browser_process.h" #include "brave/components/brave_adblock/resources/grit/brave_adblock_generated_map.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/ui/webui/settings/brave_adblock_handler.h b/browser/ui/webui/settings/brave_adblock_handler.h index 704f7504870..fc88dbacb65 100644 --- a/browser/ui/webui/settings/brave_adblock_handler.h +++ b/browser/ui/webui/settings/brave_adblock_handler.h @@ -9,8 +9,8 @@ #include "base/scoped_observation.h" #include "base/memory/raw_ptr.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" class Profile; diff --git a/browser/ui/webui/settings/brave_privacy_handler.cc b/browser/ui/webui/settings/brave_privacy_handler.cc index d6c8f56a6f8..34abdd43200 100644 --- a/browser/ui/webui/settings/brave_privacy_handler.cc +++ b/browser/ui/webui/settings/brave_privacy_handler.cc @@ -7,7 +7,7 @@ #include "base/functional/bind.h" #include "base/values.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/pref_names.h" #include "brave/components/de_amp/common/features.h" #include "brave/components/debounce/core/common/features.h" diff --git a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc index d06fcec67d3..2a2b28b2cbb 100644 --- a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc +++ b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc @@ -11,7 +11,7 @@ #include "brave/browser/ui/webui/brave_settings_ui.h" #include "brave/browser/ui/webui/settings/brave_privacy_handler.h" #include "brave/components/brave_rewards/common/pref_names.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/constants/url_constants.h" diff --git a/browser/ui/webui/settings/brave_site_settings_handler.cc b/browser/ui/webui/settings/brave_site_settings_handler.cc index 51087d3f49e..b97db3efdc9 100644 --- a/browser/ui/webui/settings/brave_site_settings_handler.cc +++ b/browser/ui/webui/settings/brave_site_settings_handler.cc @@ -8,7 +8,7 @@ #include #include "base/values.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/ui/webui/settings/site_settings_helper.h" #include "components/grit/brave_components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/browser/ui/webui/settings/brave_site_settings_handler_unittest.cc b/browser/ui/webui/settings/brave_site_settings_handler_unittest.cc index 203be1ab351..fbea771ab7f 100644 --- a/browser/ui/webui/settings/brave_site_settings_handler_unittest.cc +++ b/browser/ui/webui/settings/brave_site_settings_handler_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/values.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/ui/webui/settings/site_settings_helper.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/browser/ui/webui/settings/default_brave_shields_handler.cc b/browser/ui/webui/settings/default_brave_shields_handler.cc index 2e6833b2cc5..a0791949867 100644 --- a/browser/ui/webui/settings/default_brave_shields_handler.cc +++ b/browser/ui/webui/settings/default_brave_shields_handler.cc @@ -9,7 +9,7 @@ #include "base/functional/bind.h" #include "base/values.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/browser/ui/webui/sources.gni b/browser/ui/webui/sources.gni index 774d08f8291..95202585624 100644 --- a/browser/ui/webui/sources.gni +++ b/browser/ui/webui/sources.gni @@ -10,7 +10,7 @@ import("//brave/components/playlist/common/buildflags/buildflags.gni") brave_browser_ui_webui_configs_deps = [ "//base", "//brave/browser/ui", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/brave_vpn/common/buildflags", "//brave/components/playlist/common/buildflags", ] diff --git a/browser/ui/webui/webcompat_reporter/webcompat_reporter_dialog.cc b/browser/ui/webui/webcompat_reporter/webcompat_reporter_dialog.cc index f49ed92caf2..fc50f2a8060 100644 --- a/browser/ui/webui/webcompat_reporter/webcompat_reporter_dialog.cc +++ b/browser/ui/webui/webcompat_reporter/webcompat_reporter_dialog.cc @@ -13,7 +13,7 @@ #include "base/json/json_writer.h" #include "base/values.h" #include "brave/browser/ui/brave_shields_data_controller.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom-shared.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom-shared.h" #include "brave/components/constants/webui_url_constants.h" #include "brave/components/webcompat_reporter/browser/fields.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" diff --git a/browser/ui/webui/webcompat_reporter/webcompat_reporter_ui.cc b/browser/ui/webui/webcompat_reporter/webcompat_reporter_ui.cc index eada8dd496a..81dca2e0565 100644 --- a/browser/ui/webui/webcompat_reporter/webcompat_reporter_ui.cc +++ b/browser/ui/webui/webcompat_reporter/webcompat_reporter_ui.cc @@ -13,10 +13,10 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/ui/brave_shields_data_controller.h" #include "brave/browser/ui/webui/brave_webui_source.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/constants/webui_url_constants.h" #include "brave/components/webcompat_reporter/browser/fields.h" diff --git a/build/android/config.gni b/build/android/config.gni index 319da5fe453..5373efeba4a 100644 --- a/build/android/config.gni +++ b/build/android/config.gni @@ -33,7 +33,7 @@ brave_chrome_java_deps = [ "//brave/components/ai_chat/core/common/mojom:mojom_java", "//brave/components/brave_news/common:mojom_java", "//brave/components/brave_rewards/common/mojom:mojom_java", - "//brave/components/brave_shields/common:mojom_java", + "//brave/components/brave_shields/core/common:mojom_java", "//brave/components/brave_wallet/common:mojom_java", "//brave/components/browser_ui/accessibility/android:java", "//brave/components/browser_ui/site_settings/android:java", diff --git a/chromium_src/chrome/browser/download/background_download_service_factory.cc b/chromium_src/chrome/browser/download/background_download_service_factory.cc index 46b6ddea19f..61207d3a4f4 100644 --- a/chromium_src/chrome/browser/download/background_download_service_factory.cc +++ b/chromium_src/chrome/browser/download/background_download_service_factory.cc @@ -6,9 +6,9 @@ #include "chrome/browser/download/background_download_service_factory.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_download_client.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_client.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" #include "chrome/browser/download/deferred_client_wrapper.h" #include "components/download/content/factory/download_service_factory_helper.h" diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc index 88bc15c07e9..adc5f1abe95 100644 --- a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_news/common/features.h" #include "brave/components/brave_rewards/common/features.h" #include "brave/components/brave_search_conversion/features.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_vpn/common/features.h" #include "brave/components/brave_wallet/common/features.h" #include "brave/components/debounce/core/common/features.h" diff --git a/chromium_src/chrome/browser/ssl/https_upgrades_interceptor.cc b/chromium_src/chrome/browser/ssl/https_upgrades_interceptor.cc index 3d266f6f137..fe9e90f9ab4 100644 --- a/chromium_src/chrome/browser/ssl/https_upgrades_interceptor.cc +++ b/chromium_src/chrome/browser/ssl/https_upgrades_interceptor.cc @@ -6,7 +6,7 @@ #include "chrome/browser/ssl/https_upgrades_interceptor.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "net/base/features.h" #include "net/base/url_util.h" diff --git a/chromium_src/chrome/browser/ssl/https_upgrades_navigation_throttle.cc b/chromium_src/chrome/browser/ssl/https_upgrades_navigation_throttle.cc index 1d47d73c089..23684e7892b 100644 --- a/chromium_src/chrome/browser/ssl/https_upgrades_navigation_throttle.cc +++ b/chromium_src/chrome/browser/ssl/https_upgrades_navigation_throttle.cc @@ -7,7 +7,7 @@ #include "base/time/time.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/https_first_mode_settings_tracker.h" diff --git a/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper.cc index 8510caed64f..62ef259c9f8 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -9,7 +9,7 @@ #include #include "base/containers/cxx20_erase_vector.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "third_party/blink/public/common/features.h" #define HasRegisteredGroupName HasRegisteredGroupName_ChromiumImpl diff --git a/chromium_src/chrome/renderer/DEPS b/chromium_src/chrome/renderer/DEPS index cdb615181f3..92e0b7796f8 100644 --- a/chromium_src/chrome/renderer/DEPS +++ b/chromium_src/chrome/renderer/DEPS @@ -1,7 +1,7 @@ include_rules = [ "+brave/components/ai_chat/core/common", "+brave/components/ai_chat/renderer", - "+brave/components/brave_shields/common", + "+brave/components/brave_shields/core/common", "+brave/components/content_settings/renderer", "+brave/renderer", "+media/base/key_system_info.h", diff --git a/chromium_src/chrome/renderer/worker_content_settings_client.cc b/chromium_src/chrome/renderer/worker_content_settings_client.cc index 173e73ad8de..2dbdf93c498 100644 --- a/chromium_src/chrome/renderer/worker_content_settings_client.cc +++ b/chromium_src/chrome/renderer/worker_content_settings_client.cc @@ -5,7 +5,7 @@ #include -#include "brave/components/brave_shields/common/brave_shield_utils.h" +#include "brave/components/brave_shields/core/common/brave_shield_utils.h" #include "chrome/renderer/worker_content_settings_client.h" #include "components/content_settings/renderer/content_settings_agent_impl.h" #include "net/base/features.h" diff --git a/chromium_src/chrome/test/sources.gni b/chromium_src/chrome/test/sources.gni index 916b0255129..c81d96b57d0 100644 --- a/chromium_src/chrome/test/sources.gni +++ b/chromium_src/chrome/test/sources.gni @@ -11,7 +11,7 @@ brave_chromium_src_chrome_test_test_support_sources = [ ] brave_chromium_src_chrome_test_test_support_deps = [ - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/brave_vpn/common/buildflags", "//brave/components/ipfs/buildflags", "//brave/components/tor/buildflags", diff --git a/chromium_src/components/content_settings/core/browser/DEPS b/chromium_src/components/content_settings/core/browser/DEPS index 16fb81cb6dc..4aedc580a20 100644 --- a/chromium_src/components/content_settings/core/browser/DEPS +++ b/chromium_src/components/content_settings/core/browser/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+brave/components/content_settings/core/browser", - "+brave/components/brave_shields/common", + "+brave/components/brave_shields/core/common", "+brave/components/constants", ] diff --git a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc index f0c44cd13dc..b9a5763d4cb 100644 --- a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc +++ b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc @@ -7,7 +7,7 @@ #include "src/components/content_settings/core/browser/content_settings_registry.cc" #undef BRAVE_INIT -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "components/content_settings/core/common/content_settings.h" #include "net/base/features.h" diff --git a/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc b/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc index 9aaf884b768..b80033ebfd3 100644 --- a/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc +++ b/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc @@ -8,9 +8,9 @@ #include "brave/browser/brave_browser_process.h" #include "brave/components/brave_component_updater/browser/local_data_files_service.h" #include "brave/components/brave_perf_predictor/common/pref_names.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/browser/test_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/components/brave_shields/adblock/BUILD.gn b/components/brave_shields/adblock/BUILD.gn index 6cbe4d01283..1754660c380 100644 --- a/components/brave_shields/adblock/BUILD.gn +++ b/components/brave_shields/adblock/BUILD.gn @@ -5,8 +5,9 @@ group("rust_lib") { visibility = [ - "//brave/components/brave_shields/browser:*", - "//brave/components/brave_shields/common:*", + "//brave/components/brave_shields/content/browser:*", + "//brave/components/brave_shields/core/browser:*", + "//brave/components/brave_shields/core/common:*", "//brave/fuzzers:*", "//brave/ios/browser/api/brave_shields:*", ] diff --git a/components/brave_shields/browser/BUILD.gn b/components/brave_shields/browser/BUILD.gn deleted file mode 100644 index ac979a8dbeb..00000000000 --- a/components/brave_shields/browser/BUILD.gn +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright (c) 2022 The Brave Authors. All rights reserved. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at https://mozilla.org/MPL/2.0/. - -if (!is_ios) { - static_library("browser") { - sources = [ - "ad_block_component_filters_provider.cc", - "ad_block_component_filters_provider.h", - "ad_block_component_service_manager.cc", - "ad_block_component_service_manager.h", - "ad_block_custom_filters_provider.cc", - "ad_block_custom_filters_provider.h", - "ad_block_default_resource_provider.cc", - "ad_block_default_resource_provider.h", - "ad_block_engine.cc", - "ad_block_engine.h", - "ad_block_filter_list_catalog_provider.cc", - "ad_block_filter_list_catalog_provider.h", - "ad_block_filters_provider.cc", - "ad_block_filters_provider.h", - "ad_block_filters_provider_manager.cc", - "ad_block_filters_provider_manager.h", - "ad_block_localhost_filters_provider.cc", - "ad_block_localhost_filters_provider.h", - "ad_block_pref_service.cc", - "ad_block_pref_service.h", - "ad_block_resource_provider.cc", - "ad_block_resource_provider.h", - "ad_block_service.cc", - "ad_block_service.h", - "ad_block_subscription_download_client.cc", - "ad_block_subscription_download_client.h", - "ad_block_subscription_download_manager.cc", - "ad_block_subscription_download_manager.h", - "ad_block_subscription_filters_provider.cc", - "ad_block_subscription_filters_provider.h", - "ad_block_subscription_service_manager.cc", - "ad_block_subscription_service_manager.h", - "ad_block_subscription_service_manager_observer.h", - "adblock_stub_response.cc", - "adblock_stub_response.h", - "base_brave_shields_service.cc", - "base_brave_shields_service.h", - "blocked_domain_1pes_lifetime.cc", - "blocked_domain_1pes_lifetime.h", - "brave_farbling_service.cc", - "brave_farbling_service.h", - "brave_shields_p3a.cc", - "brave_shields_p3a.h", - "brave_shields_util.cc", - "brave_shields_util.h", - "cookie_list_opt_in_service.cc", - "cookie_list_opt_in_service.h", - "domain_block_controller_client.cc", - "domain_block_controller_client.h", - "domain_block_navigation_throttle.cc", - "domain_block_navigation_throttle.h", - "domain_block_page.cc", - "domain_block_page.h", - "domain_block_tab_storage.cc", - "domain_block_tab_storage.h", - "filter_list_catalog_entry.cc", - "filter_list_catalog_entry.h", - "filter_list_service.cc", - "filter_list_service.h", - ] - - deps = [ - "//base", - "//brave/components/brave_component_updater/browser", - "//brave/components/brave_shields/adblock:rust_lib", - "//brave/components/brave_shields/common", - "//brave/components/brave_shields/common:mojom", - "//brave/components/constants", - "//brave/components/content_settings/core/common", - "//brave/components/debounce/core/common", - "//brave/components/ephemeral_storage", - "//brave/components/https_upgrade_exceptions/browser", - "//brave/components/l10n/common", - "//brave/components/p3a", - "//brave/components/p3a_utils", - "//brave/components/resources:static_resources_grit", - "//brave/components/resources:strings_grit", - "//components/component_updater:component_updater", - "//components/content_settings/core/browser", - "//components/content_settings/core/common", - "//components/pref_registry:pref_registry", - "//components/prefs", - "//components/proxy_config", - "//components/security_interstitials/content:security_interstitial_page", - "//components/security_interstitials/core", - "//components/user_prefs", - "//content/public/browser", - "//mojo/public/cpp/bindings", - "//third_party/abseil-cpp:absl", - "//third_party/blink/public/mojom:mojom_platform_headers", - "//third_party/re2", - "//third_party/zlib/google:zip", - "//url", - ] - - public_deps = [ ":component_installer" ] - } -} - -source_set("component_installer") { - sources = [ - "ad_block_component_installer.cc", - "ad_block_component_installer.h", - "ad_block_service_helper.cc", - "ad_block_service_helper.h", - "filter_list_catalog_entry.cc", - "filter_list_catalog_entry.h", - ] - deps = [ - "//base", - "//brave/components/brave_component_updater/browser", - "//brave/components/brave_shields/adblock:rust_lib", - "//components/component_updater:component_updater", - "//crypto", - ] -} - -if (!is_ios) { - source_set("test_support") { - testonly = true - sources = [ - "engine_test_observer.cc", - "engine_test_observer.h", - "test_filters_provider.cc", - "test_filters_provider.h", - ] - - deps = [ - "//base", - "//brave/components/brave_component_updater/browser", - "//brave/components/brave_shields/browser:browser", - ] - } -} diff --git a/components/brave_shields/browser/ad_block_service_helper.h b/components/brave_shields/browser/ad_block_service_helper.h deleted file mode 100644 index 4e8d5a01193..00000000000 --- a/components/brave_shields/browser/ad_block_service_helper.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ - -#include - -#include -#include -#include - -#include "base/values.h" - -namespace brave_shields { - -void MergeCspDirectiveInto(std::optional from, - std::optional* into); - -void MergeResourcesInto(base::Value::Dict from, - base::Value::Dict& into, - bool force_hide); - -} // namespace brave_shields - -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h b/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h deleted file mode 100644 index 541c14c8c38..00000000000 --- a/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_OBSERVER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_OBSERVER_H_ - -#include "base/observer_list_types.h" - -namespace brave_shields { - -class AdBlockSubscriptionServiceManagerObserver : public base::CheckedObserver { - public: - ~AdBlockSubscriptionServiceManagerObserver() override = default; - virtual void OnServiceUpdateEvent() {} -}; - -} // namespace brave_shields - -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_OBSERVER_H_ diff --git a/components/brave_shields/content/browser/BUILD.gn b/components/brave_shields/content/browser/BUILD.gn new file mode 100644 index 00000000000..a08fe5df217 --- /dev/null +++ b/components/brave_shields/content/browser/BUILD.gn @@ -0,0 +1,87 @@ +# Copyright (c) 2022 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + +static_library("browser") { + sources = [ + "ad_block_custom_filters_provider.cc", + "ad_block_custom_filters_provider.h", + "ad_block_default_resource_provider.cc", + "ad_block_default_resource_provider.h", + "ad_block_engine.cc", + "ad_block_engine.h", + "ad_block_localhost_filters_provider.cc", + "ad_block_localhost_filters_provider.h", + "ad_block_pref_service.cc", + "ad_block_pref_service.h", + "ad_block_resource_provider.cc", + "ad_block_resource_provider.h", + "ad_block_service.cc", + "ad_block_service.h", + "ad_block_subscription_download_client.cc", + "ad_block_subscription_download_client.h", + "ad_block_subscription_download_manager.cc", + "ad_block_subscription_download_manager.h", + "ad_block_subscription_filters_provider.cc", + "ad_block_subscription_filters_provider.h", + "ad_block_subscription_service_manager.cc", + "ad_block_subscription_service_manager.h", + "ad_block_subscription_service_manager_observer.h", + "adblock_stub_response.cc", + "adblock_stub_response.h", + "base_brave_shields_service.cc", + "base_brave_shields_service.h", + "blocked_domain_1pes_lifetime.cc", + "blocked_domain_1pes_lifetime.h", + "brave_farbling_service.cc", + "brave_farbling_service.h", + "brave_shields_p3a.cc", + "brave_shields_p3a.h", + "brave_shields_util.cc", + "brave_shields_util.h", + "cookie_list_opt_in_service.cc", + "cookie_list_opt_in_service.h", + "domain_block_controller_client.cc", + "domain_block_controller_client.h", + "domain_block_navigation_throttle.cc", + "domain_block_navigation_throttle.h", + "domain_block_page.cc", + "domain_block_page.h", + "domain_block_tab_storage.cc", + "domain_block_tab_storage.h", + "filter_list_service.cc", + "filter_list_service.h", + ] + + deps = [ + "//base", + "//brave/components/brave_component_updater/browser", + "//brave/components/brave_shields/adblock:rust_lib", + "//brave/components/brave_shields/core/browser", + "//brave/components/brave_shields/core/common", + "//brave/components/brave_shields/core/common:mojom", + "//brave/components/constants", + "//brave/components/content_settings/core/common", + "//brave/components/ephemeral_storage", + "//brave/components/https_upgrade_exceptions/browser", + "//brave/components/l10n/common", + "//brave/components/p3a", + "//brave/components/p3a_utils", + "//brave/components/resources:static_resources_grit", + "//components/component_updater:component_updater", + "//components/content_settings/core/browser", + "//components/content_settings/core/common", + "//components/pref_registry:pref_registry", + "//components/prefs", + "//components/proxy_config", + "//components/security_interstitials/content:security_interstitial_page", + "//components/security_interstitials/core", + "//components/user_prefs", + "//content/public/browser", + "//mojo/public/cpp/bindings", + "//third_party/abseil-cpp:absl", + "//third_party/blink/public/mojom:mojom_platform_headers", + "//url", + ] +} diff --git a/components/brave_shields/browser/DEPS b/components/brave_shields/content/browser/DEPS similarity index 100% rename from components/brave_shields/browser/DEPS rename to components/brave_shields/content/browser/DEPS diff --git a/components/brave_shields/browser/ad_block_custom_filters_provider.cc b/components/brave_shields/content/browser/ad_block_custom_filters_provider.cc similarity index 84% rename from components/brave_shields/browser/ad_block_custom_filters_provider.cc rename to components/brave_shields/content/browser/ad_block_custom_filters_provider.cc index af1425f966a..bc281823823 100644 --- a/components/brave_shields/browser/ad_block_custom_filters_provider.cc +++ b/components/brave_shields/content/browser/ad_block_custom_filters_provider.cc @@ -1,16 +1,16 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" #include #include #include "base/task/single_thread_task_runner.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_service.h" namespace brave_shields { @@ -56,16 +56,18 @@ void AdBlockCustomFiltersProvider::CreateSiteExemption( std::string AdBlockCustomFiltersProvider::GetCustomFilters() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!local_state_) + if (!local_state_) { return std::string(); + } return local_state_->GetString(prefs::kAdBlockCustomFilters); } bool AdBlockCustomFiltersProvider::UpdateCustomFilters( const std::string& custom_filters) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!local_state_) + if (!local_state_) { return false; + } local_state_->SetString(prefs::kAdBlockCustomFilters, custom_filters); NotifyObservers(engine_is_default_); diff --git a/components/brave_shields/browser/ad_block_custom_filters_provider.h b/components/brave_shields/content/browser/ad_block_custom_filters_provider.h similarity index 69% rename from components/brave_shields/browser/ad_block_custom_filters_provider.h rename to components/brave_shields/content/browser/ad_block_custom_filters_provider.h index 5112f41556b..5cbcadec326 100644 --- a/components/brave_shields/browser/ad_block_custom_filters_provider.h +++ b/components/brave_shields/content/browser/ad_block_custom_filters_provider.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_CUSTOM_FILTERS_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_CUSTOM_FILTERS_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_CUSTOM_FILTERS_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_CUSTOM_FILTERS_PROVIDER_H_ #include @@ -12,7 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" using brave_component_updater::DATFileDataBuffer; @@ -52,4 +52,4 @@ class AdBlockCustomFiltersProvider : public AdBlockFiltersProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_CUSTOM_FILTERS_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_CUSTOM_FILTERS_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_default_resource_provider.cc b/components/brave_shields/content/browser/ad_block_default_resource_provider.cc similarity index 84% rename from components/brave_shields/browser/ad_block_default_resource_provider.cc rename to components/brave_shields/content/browser/ad_block_default_resource_provider.cc index 48030cdd984..55f006d6b85 100644 --- a/components/brave_shields/browser/ad_block_default_resource_provider.cc +++ b/components/brave_shields/content/browser/ad_block_default_resource_provider.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_default_resource_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_default_resource_provider.h" #include #include @@ -12,8 +12,8 @@ #include "base/files/file_path.h" #include "base/metrics/field_trial_params.h" #include "base/task/thread_pool.h" -#include "brave/components/brave_shields/browser/ad_block_component_installer.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_installer.h" namespace { constexpr char kAdBlockResourcesFilename[] = "resources.json"; diff --git a/components/brave_shields/browser/ad_block_default_resource_provider.h b/components/brave_shields/content/browser/ad_block_default_resource_provider.h similarity index 62% rename from components/brave_shields/browser/ad_block_default_resource_provider.h rename to components/brave_shields/content/browser/ad_block_default_resource_provider.h index 78023bfd7ff..f7a8c92a150 100644 --- a/components/brave_shields/browser/ad_block_default_resource_provider.h +++ b/components/brave_shields/content/browser/ad_block_default_resource_provider.h @@ -1,16 +1,16 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_DEFAULT_RESOURCE_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_DEFAULT_RESOURCE_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_DEFAULT_RESOURCE_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_DEFAULT_RESOURCE_PROVIDER_H_ #include #include "base/functional/callback.h" #include "base/timer/timer.h" -#include "brave/components/brave_shields/browser/ad_block_resource_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_resource_provider.h" namespace component_updater { class ComponentUpdateService; @@ -46,4 +46,4 @@ class AdBlockDefaultResourceProvider : public AdBlockResourceProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_DEFAULT_RESOURCE_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_DEFAULT_RESOURCE_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_engine.cc b/components/brave_shields/content/browser/ad_block_engine.cc similarity index 97% rename from components/brave_shields/browser/ad_block_engine.cc rename to components/brave_shields/content/browser/ad_block_engine.cc index 97bd81a73d6..4601a104f20 100644 --- a/components/brave_shields/browser/ad_block_engine.cc +++ b/components/brave_shields/content/browser/ad_block_engine.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_engine.h" +#include "brave/components/brave_shields/content/browser/ad_block_engine.h" #include #include @@ -21,7 +21,7 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "url/origin.h" -using namespace net::registry_controlled_domains; // NOLINT +using net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES; namespace { diff --git a/components/brave_shields/browser/ad_block_engine.h b/components/brave_shields/content/browser/ad_block_engine.h similarity index 88% rename from components/brave_shields/browser/ad_block_engine.h rename to components/brave_shields/content/browser/ad_block_engine.h index 7dde568641f..067e1d35121 100644 --- a/components/brave_shields/browser/ad_block_engine.h +++ b/components/brave_shields/content/browser/ad_block_engine.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_ENGINE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_ENGINE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_ENGINE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_ENGINE_H_ #include @@ -116,4 +116,4 @@ class AdBlockEngine : public base::SupportsWeakPtr { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_ENGINE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_ENGINE_H_ diff --git a/components/brave_shields/browser/ad_block_localhost_filters_provider.cc b/components/brave_shields/content/browser/ad_block_localhost_filters_provider.cc similarity index 92% rename from components/brave_shields/browser/ad_block_localhost_filters_provider.cc rename to components/brave_shields/content/browser/ad_block_localhost_filters_provider.cc index 8cb6147cc4b..f9d6d78514c 100644 --- a/components/brave_shields/browser/ad_block_localhost_filters_provider.cc +++ b/components/brave_shields/content/browser/ad_block_localhost_filters_provider.cc @@ -3,13 +3,13 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_localhost_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_localhost_filters_provider.h" #include #include #include "base/task/single_thread_task_runner.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" #include "components/prefs/pref_service.h" namespace brave_shields { diff --git a/components/brave_shields/browser/ad_block_localhost_filters_provider.h b/components/brave_shields/content/browser/ad_block_localhost_filters_provider.h similarity index 78% rename from components/brave_shields/browser/ad_block_localhost_filters_provider.h rename to components/brave_shields/content/browser/ad_block_localhost_filters_provider.h index c8db2123b85..d4beb7c4d75 100644 --- a/components/brave_shields/browser/ad_block_localhost_filters_provider.h +++ b/components/brave_shields/content/browser/ad_block_localhost_filters_provider.h @@ -3,8 +3,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_LOCALHOST_FILTERS_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_LOCALHOST_FILTERS_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_LOCALHOST_FILTERS_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_LOCALHOST_FILTERS_PROVIDER_H_ #include @@ -12,7 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" using brave_component_updater::DATFileDataBuffer; @@ -45,4 +45,4 @@ class AdBlockLocalhostFiltersProvider : public AdBlockFiltersProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_LOCALHOST_FILTERS_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_LOCALHOST_FILTERS_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_pref_service.cc b/components/brave_shields/content/browser/ad_block_pref_service.cc similarity index 86% rename from components/brave_shields/browser/ad_block_pref_service.cc rename to components/brave_shields/content/browser/ad_block_pref_service.cc index db917cdbf2b..b881b26ebd7 100644 --- a/components/brave_shields/browser/ad_block_pref_service.cc +++ b/components/brave_shields/content/browser/ad_block_pref_service.cc @@ -1,16 +1,16 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_pref_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_pref_service.h" #include #include "base/functional/bind.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker.h" diff --git a/components/brave_shields/browser/ad_block_pref_service.h b/components/brave_shields/content/browser/ad_block_pref_service.h similarity index 79% rename from components/brave_shields/browser/ad_block_pref_service.h rename to components/brave_shields/content/browser/ad_block_pref_service.h index 09bf3a3d601..c747237a65e 100644 --- a/components/brave_shields/browser/ad_block_pref_service.h +++ b/components/brave_shields/content/browser/ad_block_pref_service.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_PREF_SERVICE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_PREF_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_PREF_SERVICE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_PREF_SERVICE_H_ #include #include @@ -60,4 +60,4 @@ class AdBlockPrefService : public KeyedService, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_PREF_SERVICE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_PREF_SERVICE_H_ diff --git a/components/brave_shields/browser/ad_block_resource_provider.cc b/components/brave_shields/content/browser/ad_block_resource_provider.cc similarity index 61% rename from components/brave_shields/browser/ad_block_resource_provider.cc rename to components/brave_shields/content/browser/ad_block_resource_provider.cc index 29795d5f485..64e4e4f2187 100644 --- a/components/brave_shields/browser/ad_block_resource_provider.cc +++ b/components/brave_shields/content/browser/ad_block_resource_provider.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_resource_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_resource_provider.h" #include @@ -15,14 +15,16 @@ AdBlockResourceProvider::~AdBlockResourceProvider() = default; void AdBlockResourceProvider::AddObserver( AdBlockResourceProvider::Observer* observer) { - if (!observers_.HasObserver(observer)) + if (!observers_.HasObserver(observer)) { observers_.AddObserver(observer); + } } void AdBlockResourceProvider::RemoveObserver( AdBlockResourceProvider::Observer* observer) { - if (observers_.HasObserver(observer)) + if (observers_.HasObserver(observer)) { observers_.RemoveObserver(observer); + } } void AdBlockResourceProvider::OnResourcesLoaded( diff --git a/components/brave_shields/browser/ad_block_resource_provider.h b/components/brave_shields/content/browser/ad_block_resource_provider.h similarity index 66% rename from components/brave_shields/browser/ad_block_resource_provider.h rename to components/brave_shields/content/browser/ad_block_resource_provider.h index d2e71e2bc0f..d14eb274c08 100644 --- a/components/brave_shields/browser/ad_block_resource_provider.h +++ b/components/brave_shields/content/browser/ad_block_resource_provider.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_RESOURCE_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_RESOURCE_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_RESOURCE_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_RESOURCE_PROVIDER_H_ #include @@ -44,4 +44,4 @@ class AdBlockResourceProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_RESOURCE_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_RESOURCE_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_service.cc b/components/brave_shields/content/browser/ad_block_service.cc similarity index 92% rename from components/brave_shields/browser/ad_block_service.cc rename to components/brave_shields/content/browser/ad_block_service.cc index 88ced669a38..e4337b3a70a 100644 --- a/components/brave_shields/browser/ad_block_service.cc +++ b/components/brave_shields/content/browser/ad_block_service.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" #include #include @@ -19,18 +19,18 @@ #include "base/time/time.h" #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_component_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_default_resource_provider.h" -#include "brave/components/brave_shields/browser/ad_block_engine.h" -#include "brave/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" -#include "brave/components/brave_shields/browser/ad_block_localhost_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_default_resource_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_engine.h" +#include "brave/components/brave_shields/content/browser/ad_block_localhost_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/components/brave_shields/browser/ad_block_service.h b/components/brave_shields/content/browser/ad_block_service.h similarity index 89% rename from components/brave_shields/browser/ad_block_service.h rename to components/brave_shields/content/browser/ad_block_service.h index c27f8da5e84..a40af4405c6 100644 --- a/components/brave_shields/browser/ad_block_service.h +++ b/components/brave_shields/content/browser/ad_block_service.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SERVICE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SERVICE_H_ #include @@ -19,10 +19,10 @@ #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" -#include "brave/components/brave_shields/browser/ad_block_resource_provider.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_resource_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" #include "components/prefs/pref_registry_simple.h" #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #include "url/gurl.h" @@ -39,7 +39,7 @@ class ComponentUpdateService; namespace adblock { struct BlockerResult; struct RegexManagerDiscardPolicy; -} +} // namespace adblock namespace brave_shields { class AdBlockEngine; @@ -209,4 +209,4 @@ void RegisterPrefsForAdBlockService(PrefRegistrySimple* registry); } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SERVICE_H_ diff --git a/components/brave_shields/browser/ad_block_subscription_download_client.cc b/components/brave_shields/content/browser/ad_block_subscription_download_client.cc similarity index 84% rename from components/brave_shields/browser/ad_block_subscription_download_client.cc rename to components/brave_shields/content/browser/ad_block_subscription_download_client.cc index 9ee747ddb2d..e56063a3cd0 100644 --- a/components/brave_shields/browser/ad_block_subscription_download_client.cc +++ b/components/brave_shields/content/browser/ad_block_subscription_download_client.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_subscription_download_client.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_client.h" #include #include @@ -14,8 +14,8 @@ #include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" #include "components/download/public/background_service/download_metadata.h" #include "services/network/public/cpp/resource_request_body.h" @@ -38,8 +38,9 @@ void AdBlockSubscriptionDownloadClient::OnServiceInitialized( const std::vector& downloads) { AdBlockSubscriptionDownloadManager* download_manager = GetAdBlockSubscriptionDownloadManager(); - if (!download_manager) + if (!download_manager) { return; + } std::set outstanding_download_guids; std::map successful_downloads; @@ -59,8 +60,9 @@ void AdBlockSubscriptionDownloadClient::OnServiceInitialized( void AdBlockSubscriptionDownloadClient::OnServiceUnavailable() { AdBlockSubscriptionDownloadManager* download_manager = GetAdBlockSubscriptionDownloadManager(); - if (download_manager) + if (download_manager) { download_manager->OnDownloadServiceUnavailable(); + } } void AdBlockSubscriptionDownloadClient::OnDownloadFailed( @@ -69,8 +71,9 @@ void AdBlockSubscriptionDownloadClient::OnDownloadFailed( download::Client::FailureReason reason) { AdBlockSubscriptionDownloadManager* download_manager = GetAdBlockSubscriptionDownloadManager(); - if (download_manager) + if (download_manager) { download_manager->OnDownloadFailed(guid); + } } void AdBlockSubscriptionDownloadClient::OnDownloadSucceeded( @@ -78,8 +81,9 @@ void AdBlockSubscriptionDownloadClient::OnDownloadSucceeded( const download::CompletionInfo& completion_info) { AdBlockSubscriptionDownloadManager* download_manager = GetAdBlockSubscriptionDownloadManager(); - if (!download_manager) + if (!download_manager) { return; + } if (!completion_info.response_headers) { download_manager->OnDownloadFailed(guid); diff --git a/components/brave_shields/browser/ad_block_subscription_download_client.h b/components/brave_shields/content/browser/ad_block_subscription_download_client.h similarity index 77% rename from components/brave_shields/browser/ad_block_subscription_download_client.h rename to components/brave_shields/content/browser/ad_block_subscription_download_client.h index 17100e753cc..a58b2254977 100644 --- a/components/brave_shields/browser/ad_block_subscription_download_client.h +++ b/components/brave_shields/content/browser/ad_block_subscription_download_client.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_CLIENT_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_CLIENT_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_CLIENT_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_CLIENT_H_ #include #include @@ -13,8 +13,6 @@ #include "components/download/public/background_service/client.h" #include "components/download/public/background_service/download_metadata.h" -class Profile; - namespace brave_shields { class AdBlockSubscriptionServiceManager; @@ -57,4 +55,4 @@ class AdBlockSubscriptionDownloadClient : public download::Client { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_CLIENT_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_CLIENT_H_ diff --git a/components/brave_shields/browser/ad_block_subscription_download_manager.cc b/components/brave_shields/content/browser/ad_block_subscription_download_manager.cc similarity index 94% rename from components/brave_shields/browser/ad_block_subscription_download_manager.cc rename to components/brave_shields/content/browser/ad_block_subscription_download_manager.cc index cd3e0348b2f..777f54987a8 100644 --- a/components/brave_shields/browser/ad_block_subscription_download_manager.cc +++ b/components/brave_shields/content/browser/ad_block_subscription_download_manager.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_manager.h" #include #include @@ -12,7 +12,7 @@ #include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/uuid.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "build/build_config.h" #include "components/download/public/background_service/background_download_service.h" #include "net/traffic_annotation/network_traffic_annotation.h" diff --git a/components/brave_shields/browser/ad_block_subscription_download_manager.h b/components/brave_shields/content/browser/ad_block_subscription_download_manager.h similarity index 90% rename from components/brave_shields/browser/ad_block_subscription_download_manager.h rename to components/brave_shields/content/browser/ad_block_subscription_download_manager.h index 4962b1aa64a..8bc3d1e180c 100644 --- a/components/brave_shields/browser/ad_block_subscription_download_manager.h +++ b/components/brave_shields/content/browser/ad_block_subscription_download_manager.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_H_ #include #include @@ -147,4 +147,4 @@ class AdBlockSubscriptionDownloadManager } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_DOWNLOAD_MANAGER_H_ diff --git a/components/brave_shields/browser/ad_block_subscription_filters_provider.cc b/components/brave_shields/content/browser/ad_block_subscription_filters_provider.cc similarity index 86% rename from components/brave_shields/browser/ad_block_subscription_filters_provider.cc rename to components/brave_shields/content/browser/ad_block_subscription_filters_provider.cc index e9cbe11e288..ac351ddd8e1 100644 --- a/components/brave_shields/browser/ad_block_subscription_filters_provider.cc +++ b/components/brave_shields/content/browser/ad_block_subscription_filters_provider.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_subscription_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_filters_provider.h" #include #include @@ -13,7 +13,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" #include "components/prefs/pref_service.h" namespace brave_shields { diff --git a/components/brave_shields/browser/ad_block_subscription_filters_provider.h b/components/brave_shields/content/browser/ad_block_subscription_filters_provider.h similarity index 71% rename from components/brave_shields/browser/ad_block_subscription_filters_provider.h rename to components/brave_shields/content/browser/ad_block_subscription_filters_provider.h index 80117284860..8e0d99845e5 100644 --- a/components/brave_shields/browser/ad_block_subscription_filters_provider.h +++ b/components/brave_shields/content/browser/ad_block_subscription_filters_provider.h @@ -1,17 +1,17 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_FILTERS_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_FILTERS_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_FILTERS_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_FILTERS_PROVIDER_H_ #include #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" using brave_component_updater::DATFileDataBuffer; @@ -61,4 +61,4 @@ class AdBlockSubscriptionFiltersProvider : public AdBlockFiltersProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_FILTERS_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_FILTERS_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.cc b/components/brave_shields/content/browser/ad_block_subscription_service_manager.cc similarity index 94% rename from components/brave_shields/browser/ad_block_subscription_service_manager.cc rename to components/brave_shields/content/browser/ad_block_subscription_service_manager.cc index 33e3f64402a..135dfedb7e0 100644 --- a/components/brave_shields/browser/ad_block_subscription_service_manager.cc +++ b/components/brave_shields/content/browser/ad_block_subscription_service_manager.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" #include #include @@ -21,11 +21,11 @@ #include "base/time/time.h" #include "base/values.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" #include "crypto/sha2.h" @@ -180,8 +180,9 @@ void AdBlockSubscriptionServiceManager::OnUpdateTimer( component_updater::TimerUpdateScheduler::OnFinishedCallback on_finished) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!local_state_) + if (!local_state_) { return; + } subscriptions_ = local_state_->GetDict(prefs::kAdBlockListSubscriptions).Clone(); @@ -358,8 +359,9 @@ void AdBlockSubscriptionServiceManager::OnListMetadata( std::optional info = GetInfo(sub_url); - if (!info) + if (!info) { return; + } // Title can only be set once - only set it if an existing title does not // exist @@ -401,8 +403,9 @@ std::optional AdBlockSubscriptionServiceManager::GetInfo( const GURL& sub_url) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); auto* list_subscription_dict = subscriptions_.FindDict(sub_url.spec()); - if (!list_subscription_dict) + if (!list_subscription_dict) { return std::nullopt; + } return std::make_optional( BuildInfoFromDict(sub_url, *list_subscription_dict)); @@ -411,8 +414,9 @@ std::optional AdBlockSubscriptionServiceManager::GetInfo( void AdBlockSubscriptionServiceManager::LoadSubscriptionServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!local_state_) + if (!local_state_) { return; + } subscriptions_ = local_state_->GetDict(prefs::kAdBlockListSubscriptions).Clone(); @@ -449,8 +453,9 @@ void AdBlockSubscriptionServiceManager::UpdateSubscriptionPrefs( const GURL& sub_url, const SubscriptionInfo& info) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!local_state_) + if (!local_state_) { return; + } ScopedDictPrefUpdate update(local_state_, prefs::kAdBlockListSubscriptions); base::Value::Dict& subscriptions = update.Get(); @@ -478,8 +483,9 @@ void AdBlockSubscriptionServiceManager::UpdateSubscriptionPrefs( void AdBlockSubscriptionServiceManager::ClearSubscriptionPrefs( const GURL& sub_url) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!local_state_) + if (!local_state_) { return; + } ScopedDictPrefUpdate update(local_state_, prefs::kAdBlockListSubscriptions); base::Value::Dict& subscriptions = update.Get(); @@ -495,8 +501,9 @@ void AdBlockSubscriptionServiceManager::OnSubscriptionDownloaded( std::optional info = GetInfo(sub_url); - if (!info) + if (!info) { return; + } info->last_update_attempt = base::Time::Now(); info->last_successful_update_attempt = info->last_update_attempt; @@ -515,8 +522,9 @@ void AdBlockSubscriptionServiceManager::OnSubscriptionDownloadFailure( const GURL& sub_url) { std::optional info = GetInfo(sub_url); - if (!info) + if (!info) { return; + } info->last_update_attempt = base::Time::Now(); UpdateSubscriptionPrefs(sub_url, *info); diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.h b/components/brave_shields/content/browser/ad_block_subscription_service_manager.h similarity index 89% rename from components/brave_shields/browser/ad_block_subscription_service_manager.h rename to components/brave_shields/content/browser/ad_block_subscription_service_manager.h index 572be488259..0bd8304cbde 100644 --- a/components/brave_shields/browser/ad_block_subscription_service_manager.h +++ b/components/brave_shields/content/browser/ad_block_subscription_service_manager.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_H_ #include #include @@ -20,7 +20,7 @@ #include "base/time/time.h" #include "base/values.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_download_manager.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_download_manager.h" #include "components/component_updater/timer_update_scheduler.h" #include "components/prefs/pref_service.h" #include "url/gurl.h" @@ -33,7 +33,6 @@ class JSONValueConverter; } namespace brave_shields { -class AdBlockResourceProvider; class AdBlockSubscriptionServiceManagerObserver; class AdBlockSubscriptionFiltersProvider; } // namespace brave_shields @@ -159,4 +158,4 @@ class AdBlockSubscriptionServiceManager { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_H_ diff --git a/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h b/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h new file mode 100644 index 00000000000..8fd0650b5a4 --- /dev/null +++ b/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h @@ -0,0 +1,21 @@ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_OBSERVER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_OBSERVER_H_ + +#include "base/observer_list_types.h" + +namespace brave_shields { + +class AdBlockSubscriptionServiceManagerObserver : public base::CheckedObserver { + public: + ~AdBlockSubscriptionServiceManagerObserver() override = default; + virtual void OnServiceUpdateEvent() {} +}; + +} // namespace brave_shields + +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_AD_BLOCK_SUBSCRIPTION_SERVICE_MANAGER_OBSERVER_H_ diff --git a/components/brave_shields/browser/adblock_stub_response.cc b/components/brave_shields/content/browser/adblock_stub_response.cc similarity index 96% rename from components/brave_shields/browser/adblock_stub_response.cc rename to components/brave_shields/content/browser/adblock_stub_response.cc index bfecbda33a4..77a9e9f5624 100644 --- a/components/brave_shields/browser/adblock_stub_response.cc +++ b/components/brave_shields/content/browser/adblock_stub_response.cc @@ -1,9 +1,9 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/adblock_stub_response.h" +#include "brave/components/brave_shields/content/browser/adblock_stub_response.h" #include #include diff --git a/components/brave_shields/browser/adblock_stub_response.h b/components/brave_shields/content/browser/adblock_stub_response.h similarity index 56% rename from components/brave_shields/browser/adblock_stub_response.h rename to components/brave_shields/content/browser/adblock_stub_response.h index 3ad0ca20088..b3a6b9f6c8d 100644 --- a/components/brave_shields/browser/adblock_stub_response.h +++ b/components/brave_shields/content/browser/adblock_stub_response.h @@ -1,10 +1,10 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ADBLOCK_STUB_RESPONSE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ADBLOCK_STUB_RESPONSE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_ADBLOCK_STUB_RESPONSE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_ADBLOCK_STUB_RESPONSE_H_ #include #include @@ -26,4 +26,4 @@ void MakeStubResponse(const std::optional& data_url, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ADBLOCK_STUB_RESPONSE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_ADBLOCK_STUB_RESPONSE_H_ diff --git a/components/brave_shields/browser/base_brave_shields_service.cc b/components/brave_shields/content/browser/base_brave_shields_service.cc similarity index 79% rename from components/brave_shields/browser/base_brave_shields_service.cc rename to components/brave_shields/content/browser/base_brave_shields_service.cc index e8f31b996b3..5a50f067987 100644 --- a/components/brave_shields/browser/base_brave_shields_service.cc +++ b/components/brave_shields/content/browser/base_brave_shields_service.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/base_brave_shields_service.h" +#include "brave/components/brave_shields/content/browser/base_brave_shields_service.h" #include #include diff --git a/components/brave_shields/browser/base_brave_shields_service.h b/components/brave_shields/content/browser/base_brave_shields_service.h similarity index 76% rename from components/brave_shields/browser/base_brave_shields_service.h rename to components/brave_shields/content/browser/base_brave_shields_service.h index 0fb0cb36124..802fb882171 100644 --- a/components/brave_shields/browser/base_brave_shields_service.h +++ b/components/brave_shields/content/browser/base_brave_shields_service.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BASE_BRAVE_SHIELDS_SERVICE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BASE_BRAVE_SHIELDS_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BASE_BRAVE_SHIELDS_SERVICE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BASE_BRAVE_SHIELDS_SERVICE_H_ #include @@ -56,4 +56,4 @@ class BaseBraveShieldsService { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BASE_BRAVE_SHIELDS_SERVICE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BASE_BRAVE_SHIELDS_SERVICE_H_ diff --git a/components/brave_shields/browser/blocked_domain_1pes_lifetime.cc b/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.cc similarity index 87% rename from components/brave_shields/browser/blocked_domain_1pes_lifetime.cc rename to components/brave_shields/content/browser/blocked_domain_1pes_lifetime.cc index b5f72add832..73be22e69eb 100644 --- a/components/brave_shields/browser/blocked_domain_1pes_lifetime.cc +++ b/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/blocked_domain_1pes_lifetime.h" +#include "brave/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.h" #include "base/containers/flat_map.h" #include "base/memory/ptr_util.h" diff --git a/components/brave_shields/browser/blocked_domain_1pes_lifetime.h b/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.h similarity index 74% rename from components/brave_shields/browser/blocked_domain_1pes_lifetime.h rename to components/brave_shields/content/browser/blocked_domain_1pes_lifetime.h index 2f8dd560777..ca2affb7cbf 100644 --- a/components/brave_shields/browser/blocked_domain_1pes_lifetime.h +++ b/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ #include #include @@ -54,4 +54,4 @@ class BlockedDomain1PESLifetime } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BLOCKED_DOMAIN_1PES_LIFETIME_H_ diff --git a/components/brave_shields/browser/brave_farbling_service.cc b/components/brave_shields/content/browser/brave_farbling_service.cc similarity index 78% rename from components/brave_shields/browser/brave_farbling_service.cc rename to components/brave_shields/content/browser/brave_farbling_service.cc index 3e5346354c8..a6d8fb97871 100644 --- a/components/brave_shields/browser/brave_farbling_service.cc +++ b/components/brave_shields/content/browser/brave_farbling_service.cc @@ -1,16 +1,16 @@ -/* Copyright 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" #include #include "base/feature_list.h" #include "base/rand_util.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "crypto/hmac.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" @@ -27,8 +27,9 @@ BraveFarblingService::BraveFarblingService() { BraveFarblingService::~BraveFarblingService() = default; uint64_t BraveFarblingService::session_token(bool is_off_the_record) { - if (is_off_the_record) + if (is_off_the_record) { return incognito_session_token_; + } return session_token_; } @@ -46,8 +47,9 @@ bool BraveFarblingService::MakePseudoRandomGeneratorForURL( const std::string domain = net::registry_controlled_domains::GetDomainAndRegistry( url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); - if (domain.empty()) + if (domain.empty()) { return false; + } uint8_t domain_key[32]; uint64_t session_key = session_token(is_off_the_record); crypto::HMAC h(crypto::HMAC::SHA256); diff --git a/components/brave_shields/browser/brave_farbling_service.h b/components/brave_shields/content/browser/brave_farbling_service.h similarity index 63% rename from components/brave_shields/browser/brave_farbling_service.h rename to components/brave_shields/content/browser/brave_farbling_service.h index 7069204df1b..8f7651c101b 100644 --- a/components/brave_shields/browser/brave_farbling_service.h +++ b/components/brave_shields/content/browser/brave_farbling_service.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_FARBLING_SERVICE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_FARBLING_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_FARBLING_SERVICE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_FARBLING_SERVICE_H_ #include "third_party/abseil-cpp/absl/random/random.h" @@ -39,4 +39,4 @@ class BraveFarblingService { } // namespace brave -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_FARBLING_SERVICE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_FARBLING_SERVICE_H_ diff --git a/components/brave_shields/browser/brave_shields_p3a.cc b/components/brave_shields/content/browser/brave_shields_p3a.cc similarity index 95% rename from components/brave_shields/browser/brave_shields_p3a.cc rename to components/brave_shields/content/browser/brave_shields_p3a.cc index 2d14aaa7397..516baf8138c 100644 --- a/components/brave_shields/browser/brave_shields_p3a.cc +++ b/components/brave_shields/content/browser/brave_shields_p3a.cc @@ -1,16 +1,16 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" #include #include "base/logging.h" #include "base/metrics/histogram_functions.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_utils.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_utils.h" #include "brave/components/p3a/utils.h" #include "brave/components/p3a_utils/bucket.h" #include "components/content_settings/core/browser/host_content_settings_map.h" diff --git a/components/brave_shields/browser/brave_shields_p3a.h b/components/brave_shields/content/browser/brave_shields_p3a.h similarity index 87% rename from components/brave_shields/browser/brave_shields_p3a.h rename to components/brave_shields/content/browser/brave_shields_p3a.h index dc4b5aa25c3..f021d3a2bdc 100644 --- a/components/brave_shields/browser/brave_shields_p3a.h +++ b/components/brave_shields/content/browser/brave_shields_p3a.h @@ -1,12 +1,12 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_SHIELDS_P3A_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_SHIELDS_P3A_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_SHIELDS_P3A_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_SHIELDS_P3A_H_ -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" class PrefRegistrySimple; class PrefService; @@ -93,4 +93,4 @@ void MaybeRecordInitialShieldsSettings(PrefService* profile_prefs, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_SHIELDS_P3A_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_SHIELDS_P3A_H_ diff --git a/components/brave_shields/browser/brave_shields_util.cc b/components/brave_shields/content/browser/brave_shields_util.cc similarity index 94% rename from components/brave_shields/browser/brave_shields_util.cc rename to components/brave_shields/content/browser/brave_shields_util.cc index 1a5b7a457e1..69a998ef2d3 100644 --- a/components/brave_shields/browser/brave_shields_util.cc +++ b/components/brave_shields/content/browser/brave_shields_util.cc @@ -1,19 +1,19 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include #include "base/feature_list.h" #include "base/logging.h" #include "base/notreached.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" -#include "brave/components/brave_shields/common/brave_shield_utils.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/core/common/brave_shield_utils.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "brave/components/constants/url_constants.h" #include "brave/components/content_settings/core/common/content_settings_util.h" #include "brave/components/https_upgrade_exceptions/browser/https_upgrade_exceptions_service.h" @@ -50,16 +50,18 @@ void RecordShieldsSettingChanged(PrefService* local_state) { } ContentSetting GetDefaultAllowFromControlType(ControlType type) { - if (type == ControlType::DEFAULT) + if (type == ControlType::DEFAULT) { return CONTENT_SETTING_DEFAULT; + } return type == ControlType::BLOCK ? CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW; } ContentSetting GetDefaultBlockFromControlType(ControlType type) { - if (type == ControlType::DEFAULT) + if (type == ControlType::DEFAULT) { return CONTENT_SETTING_DEFAULT; + } return type == ControlType::ALLOW ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK; @@ -123,10 +125,12 @@ class BraveCookieRules { } void Merge(const BraveCookieRules& other) { - if (general_setting_ == CONTENT_SETTING_DEFAULT) + if (general_setting_ == CONTENT_SETTING_DEFAULT) { general_setting_ = other.general_setting_; - if (first_party_setting_ == CONTENT_SETTING_DEFAULT) + } + if (first_party_setting_ == CONTENT_SETTING_DEFAULT) { first_party_setting_ = other.first_party_setting_; + } } private: @@ -175,8 +179,9 @@ void SetBraveShieldsEnabled(HostContentSettingsMap* map, bool enable, const GURL& url, PrefService* local_state) { - if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS()) + if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS()) { return; + } if (url.is_empty()) { LOG(ERROR) << "url for shields setting cannot be blank"; @@ -213,13 +218,15 @@ void SetBraveShieldsEnabled(HostContentSettingsMap* map, } void ResetBraveShieldsEnabled(HostContentSettingsMap* map, const GURL& url) { - if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS()) + if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS()) { return; + } auto primary_pattern = GetPatternFromURL(url); - if (!primary_pattern.IsValid()) + if (!primary_pattern.IsValid()) { return; + } map->SetContentSettingCustomScope( primary_pattern, ContentSettingsPattern::Wildcard(), @@ -232,8 +239,9 @@ bool GetBraveShieldsEnabled(HostContentSettingsMap* map, const GURL& url) { url.SchemeIs(kChromeExtensionScheme)) { return true; } - if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS()) + if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS()) { return false; + } ContentSetting setting = map->GetContentSetting(url, GURL(), ContentSettingsType::BRAVE_SHIELDS); @@ -356,12 +364,14 @@ bool IsFirstPartyCosmeticFilteringEnabled(HostContentSettingsMap* map, bool IsReduceLanguageEnabledForProfile(PrefService* pref_service) { // Don't reduce language if feature is disabled - if (!base::FeatureList::IsEnabled(features::kBraveReduceLanguage)) + if (!base::FeatureList::IsEnabled(features::kBraveReduceLanguage)) { return false; + } // Don't reduce language if user preference is unchecked - if (!pref_service->GetBoolean(brave_shields::prefs::kReduceLanguageEnabled)) + if (!pref_service->GetBoolean(brave_shields::prefs::kReduceLanguageEnabled)) { return false; + } return true; } @@ -369,18 +379,21 @@ bool IsReduceLanguageEnabledForProfile(PrefService* pref_service) { bool ShouldDoReduceLanguage(HostContentSettingsMap* map, const GURL& url, PrefService* pref_service) { - if (!IsReduceLanguageEnabledForProfile(pref_service)) + if (!IsReduceLanguageEnabledForProfile(pref_service)) { return false; + } // Don't reduce language if Brave Shields is down (this also handles cases // where the URL is not HTTP(S)) - if (!brave_shields::GetBraveShieldsEnabled(map, url)) + if (!brave_shields::GetBraveShieldsEnabled(map, url)) { return false; + } // Don't reduce language if fingerprinting is off if (brave_shields::GetFingerprintingControlType(map, url) == - ControlType::ALLOW) + ControlType::ALLOW) { return false; + } return true; } @@ -388,17 +401,21 @@ bool ShouldDoReduceLanguage(HostContentSettingsMap* map, DomainBlockingType GetDomainBlockingType(HostContentSettingsMap* map, const GURL& url) { // Don't block if feature is disabled - if (!base::FeatureList::IsEnabled(brave_shields::features::kBraveDomainBlock)) + if (!base::FeatureList::IsEnabled( + brave_shields::features::kBraveDomainBlock)) { return DomainBlockingType::kNone; + } // Don't block if Brave Shields is down (this also handles cases where // the URL is not HTTP(S)) - if (!brave_shields::GetBraveShieldsEnabled(map, url)) + if (!brave_shields::GetBraveShieldsEnabled(map, url)) { return DomainBlockingType::kNone; + } // Don't block if ad blocking is off. - if (brave_shields::GetAdControlType(map, url) != ControlType::BLOCK) + if (brave_shields::GetAdControlType(map, url) != ControlType::BLOCK) { return DomainBlockingType::kNone; + } const ControlType cosmetic_control_type = brave_shields::GetCosmeticFilteringControlType(map, url); @@ -425,8 +442,9 @@ void SetCookieControlType(HostContentSettingsMap* map, const GURL& url, PrefService* local_state) { auto patterns = content_settings::CreateShieldsCookiesPatterns(url); - if (!patterns.host_pattern.IsValid()) + if (!patterns.host_pattern.IsValid()) { return; + } RecordShieldsSettingChanged(local_state); @@ -523,8 +541,9 @@ ControlType GetCookieControlType( result.Merge(default_rules); } - if (result.general_setting() == CONTENT_SETTING_ALLOW) + if (result.general_setting() == CONTENT_SETTING_ALLOW) { return ControlType::ALLOW; + } if (result.first_party_setting() != CONTENT_SETTING_BLOCK) { return ControlType::BLOCK_THIRD_PARTY; } @@ -545,8 +564,9 @@ void SetFingerprintingControlType(HostContentSettingsMap* map, PrefService* profile_state) { auto primary_pattern = GetPatternFromURL(url); - if (!primary_pattern.IsValid()) + if (!primary_pattern.IsValid()) { return; + } ControlType prev_setting = GetFingerprintingControlType(map, url); content_settings::SettingInfo setting_info; @@ -733,8 +753,9 @@ void SetNoScriptControlType(HostContentSettingsMap* map, DCHECK(type != ControlType::BLOCK_THIRD_PARTY); auto primary_pattern = GetPatternFromURL(url); - if (!primary_pattern.IsValid()) + if (!primary_pattern.IsValid()) { return; + } map->SetContentSettingCustomScope( primary_pattern, ContentSettingsPattern::Wildcard(), diff --git a/components/brave_shields/browser/brave_shields_util.h b/components/brave_shields/content/browser/brave_shields_util.h similarity index 92% rename from components/brave_shields/browser/brave_shields_util.h rename to components/brave_shields/content/browser/brave_shields_util.h index b9ac53cd86f..8f578b4c266 100644 --- a/components/brave_shields/browser/brave_shields_util.h +++ b/components/brave_shields/content/browser/brave_shields_util.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_SHIELDS_UTIL_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_SHIELDS_UTIL_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_SHIELDS_UTIL_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_SHIELDS_UTIL_H_ #include #include @@ -154,4 +154,4 @@ ShieldsSettingCounts GetAdsSettingCount(HostContentSettingsMap* map); } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_BRAVE_SHIELDS_UTIL_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_BRAVE_SHIELDS_UTIL_H_ diff --git a/components/brave_shields/browser/cookie_list_opt_in_service.cc b/components/brave_shields/content/browser/cookie_list_opt_in_service.cc similarity index 64% rename from components/brave_shields/browser/cookie_list_opt_in_service.cc rename to components/brave_shields/content/browser/cookie_list_opt_in_service.cc index 59fbc774976..d90d61b514a 100644 --- a/components/brave_shields/browser/cookie_list_opt_in_service.cc +++ b/components/brave_shields/content/browser/cookie_list_opt_in_service.cc @@ -1,21 +1,21 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/cookie_list_opt_in_service.h" +#include "brave/components/brave_shields/content/browser/cookie_list_opt_in_service.h" #include #include "base/feature_list.h" #include "base/metrics/histogram_functions.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom-forward.h" -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom-shared.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom-forward.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom-shared.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_service.h" namespace brave_shields { diff --git a/components/brave_shields/browser/cookie_list_opt_in_service.h b/components/brave_shields/content/browser/cookie_list_opt_in_service.h similarity index 67% rename from components/brave_shields/browser/cookie_list_opt_in_service.h rename to components/brave_shields/content/browser/cookie_list_opt_in_service.h index 10ce83962fe..614f4d1f28d 100644 --- a/components/brave_shields/browser/cookie_list_opt_in_service.h +++ b/components/brave_shields/content/browser/cookie_list_opt_in_service.h @@ -1,14 +1,14 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_COOKIE_LIST_OPT_IN_SERVICE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_COOKIE_LIST_OPT_IN_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_COOKIE_LIST_OPT_IN_SERVICE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_COOKIE_LIST_OPT_IN_SERVICE_H_ #include "base/memory/weak_ptr.h" -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom-forward.h" -#include "brave/components/brave_shields/common/cookie_list_opt_in.mojom.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom-forward.h" +#include "brave/components/brave_shields/core/common/cookie_list_opt_in.mojom.h" #include "components/keyed_service/core/keyed_service.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" @@ -47,4 +47,4 @@ class CookieListOptInService : public KeyedService, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_COOKIE_LIST_OPT_IN_SERVICE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_COOKIE_LIST_OPT_IN_SERVICE_H_ diff --git a/components/brave_shields/browser/domain_block_controller_client.cc b/components/brave_shields/content/browser/domain_block_controller_client.cc similarity index 84% rename from components/brave_shields/browser/domain_block_controller_client.cc rename to components/brave_shields/content/browser/domain_block_controller_client.cc index 8b46ab65302..dab974a9e75 100644 --- a/components/brave_shields/browser/domain_block_controller_client.cc +++ b/components/brave_shields/content/browser/domain_block_controller_client.cc @@ -1,12 +1,12 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/domain_block_controller_client.h" +#include "brave/components/brave_shields/content/browser/domain_block_controller_client.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/domain_block_tab_storage.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/domain_block_tab_storage.h" #include "components/prefs/pref_service.h" #include "components/security_interstitials/content/settings_page_helper.h" #include "components/security_interstitials/core/metrics_helper.h" diff --git a/components/brave_shields/browser/domain_block_controller_client.h b/components/brave_shields/content/browser/domain_block_controller_client.h similarity index 78% rename from components/brave_shields/browser/domain_block_controller_client.h rename to components/brave_shields/content/browser/domain_block_controller_client.h index f414a6b0926..2bb729c1d0c 100644 --- a/components/brave_shields/browser/domain_block_controller_client.h +++ b/components/brave_shields/content/browser/domain_block_controller_client.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_CONTROLLER_CLIENT_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_CONTROLLER_CLIENT_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_CONTROLLER_CLIENT_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_CONTROLLER_CLIENT_H_ #include #include @@ -71,4 +71,4 @@ class DomainBlockControllerClient } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_CONTROLLER_CLIENT_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_CONTROLLER_CLIENT_H_ diff --git a/components/brave_shields/browser/domain_block_navigation_throttle.cc b/components/brave_shields/content/browser/domain_block_navigation_throttle.cc similarity index 91% rename from components/brave_shields/browser/domain_block_navigation_throttle.cc rename to components/brave_shields/content/browser/domain_block_navigation_throttle.cc index 36afb1c19b6..59e4efe9d89 100644 --- a/components/brave_shields/browser/domain_block_navigation_throttle.cc +++ b/components/brave_shields/content/browser/domain_block_navigation_throttle.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/domain_block_navigation_throttle.h" +#include "brave/components/brave_shields/content/browser/domain_block_navigation_throttle.h" #include #include @@ -13,11 +13,11 @@ #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/domain_block_controller_client.h" -#include "brave/components/brave_shields/browser/domain_block_page.h" -#include "brave/components/brave_shields/browser/domain_block_tab_storage.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/domain_block_controller_client.h" +#include "brave/components/brave_shields/content/browser/domain_block_page.h" +#include "brave/components/brave_shields/content/browser/domain_block_tab_storage.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/ephemeral_storage/ephemeral_storage_service.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/prefs/pref_service.h" @@ -68,13 +68,17 @@ DomainBlockNavigationThrottle::MaybeCreateThrottleFor( ephemeral_storage::EphemeralStorageService* ephemeral_storage_service, HostContentSettingsMap* content_settings, const std::string& locale) { - if (!ad_block_service || !ad_block_custom_filters_provider) + if (!ad_block_service || !ad_block_custom_filters_provider) { return nullptr; - if (!base::FeatureList::IsEnabled(brave_shields::features::kBraveDomainBlock)) + } + if (!base::FeatureList::IsEnabled( + brave_shields::features::kBraveDomainBlock)) { return nullptr; + } // Don't block subframes. - if (!navigation_handle->IsInMainFrame()) + if (!navigation_handle->IsInMainFrame()) { return nullptr; + } return std::make_unique( navigation_handle, ad_block_service, ad_block_custom_filters_provider, ephemeral_storage_service, content_settings, locale); @@ -115,8 +119,9 @@ DomainBlockNavigationThrottle::WillStartRequest() { if (domain_blocking_type_ == DomainBlockingType::kNone) { DomainBlockTabStorage* tab_storage = DomainBlockTabStorage::FromWebContents(web_contents); - if (tab_storage) + if (tab_storage) { tab_storage->DropBlockedDomain1PESLifetime(); + } return content::NavigationThrottle::PROCEED; } @@ -124,8 +129,9 @@ DomainBlockNavigationThrottle::WillStartRequest() { // another one. DomainBlockTabStorage* tab_storage = DomainBlockTabStorage::GetOrCreate(web_contents); - if (tab_storage->IsProceeding()) + if (tab_storage->IsProceeding()) { return content::NavigationThrottle::PROCEED; + } bool aggressive_mode = brave_shields::GetCosmeticFilteringControlType( @@ -157,8 +163,9 @@ DomainBlockNavigationThrottle::WillProcessResponse() { // the IsProceeding flag. DomainBlockTabStorage* tab_storage = DomainBlockTabStorage::FromWebContents( navigation_handle()->GetWebContents()); - if (tab_storage) + if (tab_storage) { tab_storage->SetIsProceeding(false); + } return content::NavigationThrottle::PROCEED; } @@ -169,8 +176,9 @@ void DomainBlockNavigationThrottle::OnShouldBlockDomain( if (!should_block && !new_url.is_valid()) { DomainBlockTabStorage* tab_storage = DomainBlockTabStorage::FromWebContents( navigation_handle()->GetWebContents()); - if (tab_storage) + if (tab_storage) { tab_storage->DropBlockedDomain1PESLifetime(); + } // Navigation was deferred while we called the ad block service on a task // runner, but now we know that we want to allow navigation to continue. Resume(); diff --git a/components/brave_shields/browser/domain_block_navigation_throttle.h b/components/brave_shields/content/browser/domain_block_navigation_throttle.h similarity index 81% rename from components/brave_shields/browser/domain_block_navigation_throttle.h rename to components/brave_shields/content/browser/domain_block_navigation_throttle.h index 2d0a300e807..87ec992389a 100644 --- a/components/brave_shields/browser/domain_block_navigation_throttle.h +++ b/components/brave_shields/content/browser/domain_block_navigation_throttle.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_NAVIGATION_THROTTLE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_NAVIGATION_THROTTLE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_NAVIGATION_THROTTLE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_NAVIGATION_THROTTLE_H_ #include #include @@ -13,7 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "content/public/browser/navigation_throttle.h" #include "url/gurl.h" @@ -21,7 +21,6 @@ class HostContentSettingsMap; namespace content { class NavigationHandle; -class WebContents; } // namespace content namespace ephemeral_storage { @@ -86,4 +85,4 @@ class DomainBlockNavigationThrottle : public content::NavigationThrottle { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_NAVIGATION_THROTTLE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_NAVIGATION_THROTTLE_H_ diff --git a/components/brave_shields/browser/domain_block_page.cc b/components/brave_shields/content/browser/domain_block_page.cc similarity index 89% rename from components/brave_shields/browser/domain_block_page.cc rename to components/brave_shields/content/browser/domain_block_page.cc index 37e3b69201c..639ac933be3 100644 --- a/components/brave_shields/browser/domain_block_page.cc +++ b/components/brave_shields/content/browser/domain_block_page.cc @@ -1,16 +1,16 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/domain_block_page.h" +#include "brave/components/brave_shields/content/browser/domain_block_page.h" #include #include #include "base/notreached.h" #include "base/strings/string_number_conversions.h" -#include "brave/components/brave_shields/browser/domain_block_controller_client.h" +#include "brave/components/brave_shields/content/browser/domain_block_controller_client.h" #include "brave/components/l10n/common/localization_util.h" #include "components/grit/brave_components_resources.h" #include "components/grit/brave_components_strings.h" diff --git a/components/brave_shields/browser/domain_block_page.h b/components/brave_shields/content/browser/domain_block_page.h similarity index 78% rename from components/brave_shields/browser/domain_block_page.h rename to components/brave_shields/content/browser/domain_block_page.h index 63455e7fe1a..fab090d72a3 100644 --- a/components/brave_shields/browser/domain_block_page.h +++ b/components/brave_shields/content/browser/domain_block_page.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_PAGE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_PAGE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_PAGE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_PAGE_H_ #include #include @@ -59,4 +59,4 @@ class DomainBlockPage } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_PAGE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_PAGE_H_ diff --git a/components/brave_shields/browser/domain_block_tab_storage.cc b/components/brave_shields/content/browser/domain_block_tab_storage.cc similarity index 82% rename from components/brave_shields/browser/domain_block_tab_storage.cc rename to components/brave_shields/content/browser/domain_block_tab_storage.cc index 2e5140b83a4..329f46d7f61 100644 --- a/components/brave_shields/browser/domain_block_tab_storage.cc +++ b/components/brave_shields/content/browser/domain_block_tab_storage.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/domain_block_tab_storage.h" +#include "brave/components/brave_shields/content/browser/domain_block_tab_storage.h" #include diff --git a/components/brave_shields/browser/domain_block_tab_storage.h b/components/brave_shields/content/browser/domain_block_tab_storage.h similarity index 74% rename from components/brave_shields/browser/domain_block_tab_storage.h rename to components/brave_shields/content/browser/domain_block_tab_storage.h index b97c1e1b32f..233e8ff0775 100644 --- a/components/brave_shields/browser/domain_block_tab_storage.h +++ b/components/brave_shields/content/browser/domain_block_tab_storage.h @@ -1,13 +1,13 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_TAB_STORAGE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_TAB_STORAGE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_TAB_STORAGE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_TAB_STORAGE_H_ #include "base/memory/ref_counted.h" -#include "brave/components/brave_shields/browser/blocked_domain_1pes_lifetime.h" +#include "brave/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.h" #include "content/public/browser/web_contents_user_data.h" namespace content { @@ -56,4 +56,4 @@ class DomainBlockTabStorage } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_DOMAIN_BLOCK_TAB_STORAGE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_DOMAIN_BLOCK_TAB_STORAGE_H_ diff --git a/components/brave_shields/browser/filter_list_service.cc b/components/brave_shields/content/browser/filter_list_service.cc similarity index 79% rename from components/brave_shields/browser/filter_list_service.cc rename to components/brave_shields/content/browser/filter_list_service.cc index e710fa44a8c..84eeeb17499 100644 --- a/components/brave_shields/browser/filter_list_service.cc +++ b/components/brave_shields/content/browser/filter_list_service.cc @@ -1,23 +1,23 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2023 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/filter_list_service.h" +#include "brave/components/brave_shields/content/browser/filter_list_service.h" #include #include #include "base/feature_list.h" #include "base/strings/utf_string_conversions.h" -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" -#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/filter_list.mojom-forward.h" -#include "brave/components/brave_shields/common/filter_list.mojom-shared.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_custom_filters_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/filter_list.mojom-forward.h" +#include "brave/components/brave_shields/core/common/filter_list.mojom-shared.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "ui/base/l10n/time_format.h" diff --git a/components/brave_shields/browser/filter_list_service.h b/components/brave_shields/content/browser/filter_list_service.h similarity index 75% rename from components/brave_shields/browser/filter_list_service.h rename to components/brave_shields/content/browser/filter_list_service.h index ca45e13f8c3..64804eda122 100644 --- a/components/brave_shields/browser/filter_list_service.h +++ b/components/brave_shields/content/browser/filter_list_service.h @@ -1,16 +1,16 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2023 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_SERVICE_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_FILTER_LIST_SERVICE_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_FILTER_LIST_SERVICE_H_ #include #include #include "base/memory/weak_ptr.h" -#include "brave/components/brave_shields/common/filter_list.mojom-forward.h" -#include "brave/components/brave_shields/common/filter_list.mojom.h" +#include "brave/components/brave_shields/core/common/filter_list.mojom-forward.h" +#include "brave/components/brave_shields/core/common/filter_list.mojom.h" #include "components/keyed_service/core/keyed_service.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" @@ -53,4 +53,4 @@ class FilterListService : public KeyedService, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_SERVICE_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_BROWSER_FILTER_LIST_SERVICE_H_ diff --git a/components/brave_shields/content/test/BUILD.gn b/components/brave_shields/content/test/BUILD.gn new file mode 100644 index 00000000000..f341e2fb093 --- /dev/null +++ b/components/brave_shields/content/test/BUILD.gn @@ -0,0 +1,53 @@ +# Copyright (c) 2024 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + +import("//testing/test.gni") + +source_set("test_support") { + testonly = true + + sources = [ + "engine_test_observer.cc", + "engine_test_observer.h", + "test_filters_provider.cc", + "test_filters_provider.h", + ] + + deps = [ + "//base", + "//brave/components/brave_component_updater/browser", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/browser", + ] +} + +source_set("unit_tests") { + testonly = true + + sources = [ + "adblock_stub_response_unittest.cc", + "brave_farbling_service_unittest.cc", + "cookie_list_opt_in_service_unittest.cc", + "cosmetic_merge_unittest.cc", + "csp_merge_unittest.cc", + ] + + deps = [ + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/core/browser", + "//brave/components/brave_shields/core/common", + "//chrome/test:test_support", + "//testing/gtest", + ] + + if (!is_android) { + sources += [ + "brave_shields_p3a_unittest.cc", + "brave_shields_util_unittest.cc", + ] + + deps += [ "//brave/browser/profiles" ] + } +} diff --git a/components/brave_shields/browser/adblock_stub_response_unittest.cc b/components/brave_shields/content/test/adblock_stub_response_unittest.cc similarity index 89% rename from components/brave_shields/browser/adblock_stub_response_unittest.cc rename to components/brave_shields/content/test/adblock_stub_response_unittest.cc index b345ec9807f..d2ef0cb557e 100644 --- a/components/brave_shields/browser/adblock_stub_response_unittest.cc +++ b/components/brave_shields/content/test/adblock_stub_response_unittest.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/adblock_stub_response.h" +#include "brave/components/brave_shields/content/browser/adblock_stub_response.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/mojom/url_response_head.mojom.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/brave_shields/browser/brave_farbling_service_unittest.cc b/components/brave_shields/content/test/brave_farbling_service_unittest.cc similarity index 91% rename from components/brave_shields/browser/brave_farbling_service_unittest.cc rename to components/brave_shields/content/test/brave_farbling_service_unittest.cc index 21e53f97c1b..87996468d0f 100644 --- a/components/brave_shields/browser/brave_farbling_service_unittest.cc +++ b/components/brave_shields/content/test/brave_farbling_service_unittest.cc @@ -1,12 +1,12 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. #include #include -#include "brave/components/brave_shields/browser/brave_farbling_service.h" +#include "brave/components/brave_shields/content/browser/brave_farbling_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/random/random.h" #include "url/gurl.h" diff --git a/components/brave_shields/browser/brave_shields_p3a_unittest.cc b/components/brave_shields/content/test/brave_shields_p3a_unittest.cc similarity index 95% rename from components/brave_shields/browser/brave_shields_p3a_unittest.cc rename to components/brave_shields/content/test/brave_shields_p3a_unittest.cc index 9cbad02d9c6..0782c1ceb4f 100644 --- a/components/brave_shields/browser/brave_shields_p3a_unittest.cc +++ b/components/brave_shields/content/test/brave_shields_p3a_unittest.cc @@ -1,15 +1,15 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. #include #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/features.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" diff --git a/components/brave_shields/browser/brave_shields_util_unittest.cc b/components/brave_shields/content/test/brave_shields_util_unittest.cc similarity index 98% rename from components/brave_shields/browser/brave_shields_util_unittest.cc rename to components/brave_shields/content/test/brave_shields_util_unittest.cc index fc023e17d09..fa835844e3c 100644 --- a/components/brave_shields/browser/brave_shields_util_unittest.cc +++ b/components/brave_shields/content/test/brave_shields_util_unittest.cc @@ -1,7 +1,7 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. #include #include @@ -9,10 +9,10 @@ #include "base/files/scoped_temp_dir.h" #include "base/test/scoped_feature_list.h" #include "brave/browser/profiles/brave_profile_manager.h" -#include "brave/components/brave_shields/browser/brave_shields_p3a.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_p3a.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/pref_names.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/components/brave_shields/browser/cookie_list_opt_in_service_unittest.cc b/components/brave_shields/content/test/cookie_list_opt_in_service_unittest.cc similarity index 90% rename from components/brave_shields/browser/cookie_list_opt_in_service_unittest.cc rename to components/brave_shields/content/test/cookie_list_opt_in_service_unittest.cc index c70b858df35..ac095ee874c 100644 --- a/components/brave_shields/browser/cookie_list_opt_in_service_unittest.cc +++ b/components/brave_shields/content/test/cookie_list_opt_in_service_unittest.cc @@ -1,19 +1,19 @@ // Copyright (c) 2022 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/cookie_list_opt_in_service.h" +#include "brave/components/brave_shields/content/browser/cookie_list_opt_in_service.h" #include #include "base/feature_list.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/testing_pref_service.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/brave_shields/browser/cosmetic_merge_unittest.cc b/components/brave_shields/content/test/cosmetic_merge_unittest.cc similarity index 71% rename from components/brave_shields/browser/cosmetic_merge_unittest.cc rename to components/brave_shields/content/test/cosmetic_merge_unittest.cc index f04dc696bd3..e7e886ce0cc 100644 --- a/components/brave_shields/browser/cosmetic_merge_unittest.cc +++ b/components/brave_shields/content/test/cosmetic_merge_unittest.cc @@ -1,12 +1,12 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2020 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. #include #include "base/json/json_reader.h" -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -19,11 +19,10 @@ class CosmeticResourceMergeTest : public testing::Test { CosmeticResourceMergeTest() = default; ~CosmeticResourceMergeTest() override = default; - void CompareMergeFromStrings( - const std::string& a, - const std::string& b, - bool force_hide, - const std::string& expected) { + void CompareMergeFromStrings(const std::string& a, + const std::string& b, + bool force_hide, + const std::string& expected) { std::optional a_val = base::JSONReader::Read(a); ASSERT_TRUE(a_val); @@ -46,24 +45,26 @@ class CosmeticResourceMergeTest : public testing::Test { void TearDown() override {} }; -const char EMPTY_RESOURCES[] = "{" +const char EMPTY_RESOURCES[] = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\", " "\"generichide\": false" -"}"; + "}"; -const char NONEMPTY_RESOURCES[] = "{" +const char NONEMPTY_RESOURCES[] = + "{" "\"hide_selectors\": [\"a\", \"b\"], " "\"style_selectors\": {" - "\"c\": [\"color: #fff\"], " - "\"d\": [\"color: #000\"]" + "\"c\": [\"color: #fff\"], " + "\"d\": [\"color: #000\"]" "}, " "\"exceptions\": [\"e\", \"f\"], " "\"injected_script\": \"console.log('g')\", " "\"generichide\": false" -"}"; + "}"; TEST_F(CosmeticResourceMergeTest, MergeTwoEmptyResources) { const std::string a = EMPTY_RESOURCES; @@ -71,13 +72,14 @@ TEST_F(CosmeticResourceMergeTest, MergeTwoEmptyResources) { // Same as EMPTY_RESOURCES, but with an additional newline in the // injected_script - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\n\", " "\"generichide\": false" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } @@ -88,16 +90,17 @@ TEST_F(CosmeticResourceMergeTest, MergeEmptyIntoNonEmpty) { // Same as a, but with an additional newline at the end of the // injected_script - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [\"a\", \"b\"], " "\"style_selectors\": {" - "\"c\": [\"color: #fff\"], " - "\"d\": [\"color: #000\"]" + "\"c\": [\"color: #fff\"], " + "\"d\": [\"color: #000\"]" "}, " "\"exceptions\": [\"e\", \"f\"], " "\"injected_script\": \"console.log('g')\n\", " "\"generichide\": false" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } @@ -108,45 +111,48 @@ TEST_F(CosmeticResourceMergeTest, MergeNonEmptyIntoEmpty) { // Same as b, but with an additional newline at the beginning of the // injected_script - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [\"a\", \"b\"]," "\"style_selectors\": {" - "\"c\": [\"color: #fff\"], " - "\"d\": [\"color: #000\"]" + "\"c\": [\"color: #fff\"], " + "\"d\": [\"color: #000\"]" "}, " "\"exceptions\": [\"e\", \"f\"], " "\"injected_script\": \"\nconsole.log('g')\", " "\"generichide\": false" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } TEST_F(CosmeticResourceMergeTest, MergeNonEmptyIntoNonEmpty) { const std::string a = NONEMPTY_RESOURCES; - const std::string b = "{" + const std::string b = + "{" "\"hide_selectors\": [\"h\", \"i\"], " "\"style_selectors\": {" - "\"j\": [\"color: #eee\"], " - "\"k\": [\"color: #111\"]" + "\"j\": [\"color: #eee\"], " + "\"k\": [\"color: #111\"]" "}, " "\"exceptions\": [\"l\", \"m\"], " "\"injected_script\": \"console.log('n')\", " "\"generichide\": false" - "}"; + "}"; - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [\"a\", \"b\", \"h\", \"i\"], " "\"style_selectors\": {" - "\"c\": [\"color: #fff\"], " - "\"d\": [\"color: #000\"], " - "\"j\": [\"color: #eee\"], " - "\"k\": [\"color: #111\"]" + "\"c\": [\"color: #fff\"], " + "\"d\": [\"color: #000\"], " + "\"j\": [\"color: #eee\"], " + "\"k\": [\"color: #111\"]" "}, " "\"exceptions\": [\"e\", \"f\", \"l\", \"m\"], " "\"injected_script\": \"console.log('g')\nconsole.log('n')\", " "\"generichide\": false" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } @@ -157,157 +163,168 @@ TEST_F(CosmeticResourceMergeTest, MergeEmptyForceHide) { // Same as EMPTY_RESOURCES, but with an additional newline in the // injected_script and a new empty `force_hide_selectors` array - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\n\"," "\"generichide\": false, " "\"force_hide_selectors\": []" - "}"; + "}"; CompareMergeFromStrings(a, b, true, expected); } TEST_F(CosmeticResourceMergeTest, MergeNonEmptyForceHide) { const std::string a = NONEMPTY_RESOURCES; - const std::string b = "{" + const std::string b = + "{" "\"hide_selectors\": [\"h\", \"i\"], " "\"style_selectors\": {" - "\"j\": [\"color: #eee\"], " - "\"k\": [\"color: #111\"]" + "\"j\": [\"color: #eee\"], " + "\"k\": [\"color: #111\"]" "}, " "\"exceptions\": [\"l\", \"m\"], " "\"injected_script\": \"console.log('n')\", " "\"generichide\": false" - "}"; + "}"; - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [\"a\", \"b\"], " "\"style_selectors\": {" - "\"c\": [\"color: #fff\"], " - "\"d\": [\"color: #000\"], " - "\"j\": [\"color: #eee\"], " - "\"k\": [\"color: #111\"]" + "\"c\": [\"color: #fff\"], " + "\"d\": [\"color: #000\"], " + "\"j\": [\"color: #eee\"], " + "\"k\": [\"color: #111\"]" "}, " "\"exceptions\": [\"e\", \"f\", \"l\", \"m\"], " "\"injected_script\": \"console.log('g')\nconsole.log('n')\"," "\"generichide\": false, " "\"force_hide_selectors\": [\"h\", \"i\"]" - "}"; + "}"; CompareMergeFromStrings(a, b, true, expected); } TEST_F(CosmeticResourceMergeTest, MergeNonGenerichideIntoGenerichide) { - const std::string a = "{" + const std::string a = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\n\", " "\"generichide\": true" - "}"; + "}"; const std::string b = EMPTY_RESOURCES; - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\n\n\", " "\"generichide\": true" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } TEST_F(CosmeticResourceMergeTest, MergeGenerichideIntoNonGenerichide) { const std::string a = NONEMPTY_RESOURCES; - const std::string b = "{" + const std::string b = + "{" "\"hide_selectors\": [\"h\", \"i\"], " "\"style_selectors\": {" - "\"j\": [\"color: #eee\"], " - "\"k\": [\"color: #111\"]" + "\"j\": [\"color: #eee\"], " + "\"k\": [\"color: #111\"]" "}, " "\"exceptions\": [\"l\", \"m\"], " "\"injected_script\": \"console.log('n')\", " "\"generichide\": true" - "}"; + "}"; - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [\"a\", \"b\", \"h\", \"i\"], " "\"style_selectors\": {" - "\"c\": [\"color: #fff\"], " - "\"d\": [\"color: #000\"], " - "\"j\": [\"color: #eee\"], " - "\"k\": [\"color: #111\"]" + "\"c\": [\"color: #fff\"], " + "\"d\": [\"color: #000\"], " + "\"j\": [\"color: #eee\"], " + "\"k\": [\"color: #111\"]" "}, " "\"exceptions\": [\"e\", \"f\", \"l\", \"m\"], " "\"injected_script\": \"console.log('g')\nconsole.log('n')\", " "\"generichide\": true" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } TEST_F(CosmeticResourceMergeTest, MergeGenerichideIntoGenerichide) { - const std::string a = "{" + const std::string a = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\", " "\"generichide\": true" - "}"; + "}"; - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {}, " "\"exceptions\": [], " "\"injected_script\": \"\n\", " "\"generichide\": true" - "}"; + "}"; CompareMergeFromStrings(a, a, false, expected); } TEST_F(CosmeticResourceMergeTest, MergeStyles) { - const std::string a = "{" + const std::string a = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {" - "\".a\": [\"color: #eee\"], " - "\".b\": [\"color: #111\"], " - "\".d\": [\"padding: 0\"]" + "\".a\": [\"color: #eee\"], " + "\".b\": [\"color: #111\"], " + "\".d\": [\"padding: 0\"]" "}, " "\"exceptions\": [], " "\"injected_script\": \"\", " "\"generichide\": false" - "}"; - const std::string b = "{" + "}"; + const std::string b = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {" - "\".c\": [\"margin: 0\"], " - "\".b\": [\"background: #000\"], " - "\".a\": [\"background: #fff\"]" + "\".c\": [\"margin: 0\"], " + "\".b\": [\"background: #000\"], " + "\".a\": [\"background: #fff\"]" "}, " "\"exceptions\": [], " "\"injected_script\": \"\", " "\"generichide\": false" - "}"; + "}"; - const std::string expected = "{" + const std::string expected = + "{" "\"hide_selectors\": [], " "\"style_selectors\": {" - "\".a\": [\"color: #eee\", \"background: #fff\"], " - "\".b\": [\"color: #111\", \"background: #000\"], " - "\".c\": [\"margin: 0\"], " - "\".d\": [\"padding: 0\"] " + "\".a\": [\"color: #eee\", \"background: #fff\"], " + "\".b\": [\"color: #111\", \"background: #000\"], " + "\".c\": [\"margin: 0\"], " + "\".d\": [\"padding: 0\"] " "}, " "\"exceptions\": [], " "\"injected_script\": \"\n\", " "\"generichide\": false" - "}"; + "}"; CompareMergeFromStrings(a, b, false, expected); } - } // namespace brave_shields diff --git a/components/brave_shields/browser/csp_merge_unittest.cc b/components/brave_shields/content/test/csp_merge_unittest.cc similarity index 78% rename from components/brave_shields/browser/csp_merge_unittest.cc rename to components/brave_shields/content/test/csp_merge_unittest.cc index fd74b0a3e20..307c58fcb97 100644 --- a/components/brave_shields/browser/csp_merge_unittest.cc +++ b/components/brave_shields/content/test/csp_merge_unittest.cc @@ -1,11 +1,11 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. #include -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/brave_shields/browser/engine_test_observer.cc b/components/brave_shields/content/test/engine_test_observer.cc similarity index 55% rename from components/brave_shields/browser/engine_test_observer.cc rename to components/brave_shields/content/test/engine_test_observer.cc index 103b0592a8c..8d12b575250 100644 --- a/components/brave_shields/browser/engine_test_observer.cc +++ b/components/brave_shields/content/test/engine_test_observer.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2023 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/engine_test_observer.h" +#include "brave/components/brave_shields/content/test/engine_test_observer.h" EngineTestObserver::EngineTestObserver(brave_shields::AdBlockEngine* engine) : engine_(engine) { diff --git a/components/brave_shields/browser/engine_test_observer.h b/components/brave_shields/content/test/engine_test_observer.h similarity index 58% rename from components/brave_shields/browser/engine_test_observer.h rename to components/brave_shields/content/test/engine_test_observer.h index e14350a4e60..75ffc5a523d 100644 --- a/components/brave_shields/browser/engine_test_observer.h +++ b/components/brave_shields/content/test/engine_test_observer.h @@ -1,13 +1,13 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2023 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ENGINE_TEST_OBSERVER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ENGINE_TEST_OBSERVER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_TEST_ENGINE_TEST_OBSERVER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_TEST_ENGINE_TEST_OBSERVER_H_ #include "base/run_loop.h" -#include "brave/components/brave_shields/browser/ad_block_engine.h" +#include "brave/components/brave_shields/content/browser/ad_block_engine.h" // A test observer that allows blocking waits for an AdBlockEngine to be // updated with new rules. @@ -31,4 +31,4 @@ class EngineTestObserver : public brave_shields::AdBlockEngine::TestObserver { raw_ptr engine_ = nullptr; }; -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_ENGINE_TEST_OBSERVER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_TEST_ENGINE_TEST_OBSERVER_H_ diff --git a/components/brave_shields/browser/test_filters_provider.cc b/components/brave_shields/content/test/test_filters_provider.cc similarity index 80% rename from components/brave_shields/browser/test_filters_provider.cc rename to components/brave_shields/content/test/test_filters_provider.cc index 1e5f150e777..02e50e4c020 100644 --- a/components/brave_shields/browser/test_filters_provider.cc +++ b/components/brave_shields/content/test/test_filters_provider.cc @@ -1,14 +1,14 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/test_filters_provider.h" +#include "brave/components/brave_shields/content/test/test_filters_provider.h" #include #include -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" namespace brave_shields { diff --git a/components/brave_shields/browser/test_filters_provider.h b/components/brave_shields/content/test/test_filters_provider.h similarity index 62% rename from components/brave_shields/browser/test_filters_provider.h rename to components/brave_shields/content/test/test_filters_provider.h index b0a95ab9d8e..543e6b6cb7c 100644 --- a/components/brave_shields/browser/test_filters_provider.h +++ b/components/brave_shields/content/test/test_filters_provider.h @@ -1,18 +1,18 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_TEST_FILTERS_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_TEST_FILTERS_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_TEST_TEST_FILTERS_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_TEST_TEST_FILTERS_PROVIDER_H_ #include #include #include "base/functional/callback.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_resource_provider.h" +#include "brave/components/brave_shields/content/browser/ad_block_resource_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" using brave_component_updater::DATFileDataBuffer; @@ -45,4 +45,4 @@ class TestFiltersProvider : public AdBlockFiltersProvider, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_TEST_FILTERS_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CONTENT_TEST_TEST_FILTERS_PROVIDER_H_ diff --git a/components/brave_shields/core/browser/BUILD.gn b/components/brave_shields/core/browser/BUILD.gn new file mode 100644 index 00000000000..a6ed182654e --- /dev/null +++ b/components/brave_shields/core/browser/BUILD.gn @@ -0,0 +1,34 @@ +# Copyright (c) 2024 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + +static_library("browser") { + sources = [ + "ad_block_component_filters_provider.cc", + "ad_block_component_filters_provider.h", + "ad_block_component_installer.cc", + "ad_block_component_installer.h", + "ad_block_component_service_manager.cc", + "ad_block_component_service_manager.h", + "ad_block_filter_list_catalog_provider.cc", + "ad_block_filter_list_catalog_provider.h", + "ad_block_filters_provider.cc", + "ad_block_filters_provider.h", + "ad_block_filters_provider_manager.cc", + "ad_block_filters_provider_manager.h", + "ad_block_service_helper.cc", + "ad_block_service_helper.h", + "filter_list_catalog_entry.cc", + "filter_list_catalog_entry.h", + ] + deps = [ + "//base", + "//brave/components/brave_component_updater/browser", + "//brave/components/brave_shields/adblock:rust_lib", + "//brave/components/brave_shields/core/common", + "//components/component_updater:component_updater", + "//components/prefs", + "//crypto", + ] +} diff --git a/components/brave_shields/core/browser/DEPS b/components/brave_shields/core/browser/DEPS new file mode 100644 index 00000000000..48e88750d4a --- /dev/null +++ b/components/brave_shields/core/browser/DEPS @@ -0,0 +1,2 @@ +include_rules = [ +] diff --git a/components/brave_shields/browser/ad_block_component_filters_provider.cc b/components/brave_shields/core/browser/ad_block_component_filters_provider.cc similarity index 83% rename from components/brave_shields/browser/ad_block_component_filters_provider.cc rename to components/brave_shields/core/browser/ad_block_component_filters_provider.cc index 2320421556a..ad51b2a2805 100644 --- a/components/brave_shields/browser/ad_block_component_filters_provider.cc +++ b/components/brave_shields/core/browser/ad_block_component_filters_provider.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_component_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_filters_provider.h" #include #include @@ -11,10 +11,10 @@ #include "base/files/file_path.h" #include "base/task/thread_pool.h" -#include "brave/components/brave_shields/browser/ad_block_component_installer.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_installer.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" #include "components/component_updater/component_updater_service.h" constexpr char kListFile[] = "list.txt"; diff --git a/components/brave_shields/browser/ad_block_component_filters_provider.h b/components/brave_shields/core/browser/ad_block_component_filters_provider.h similarity index 77% rename from components/brave_shields/browser/ad_block_component_filters_provider.h rename to components/brave_shields/core/browser/ad_block_component_filters_provider.h index 9f6ed9724f1..8463827d677 100644 --- a/components/brave_shields/browser/ad_block_component_filters_provider.h +++ b/components/brave_shields/core/browser/ad_block_component_filters_provider.h @@ -1,17 +1,17 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_FILTERS_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_FILTERS_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_FILTERS_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_FILTERS_PROVIDER_H_ #include #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" using brave_component_updater::DATFileDataBuffer; @@ -78,4 +78,4 @@ class AdBlockComponentFiltersProvider : public AdBlockFiltersProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_FILTERS_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_FILTERS_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_component_installer.cc b/components/brave_shields/core/browser/ad_block_component_installer.cc similarity index 98% rename from components/brave_shields/browser/ad_block_component_installer.cc rename to components/brave_shields/core/browser/ad_block_component_installer.cc index 1ba326b9876..0f9bd19f0ab 100644 --- a/components/brave_shields/browser/ad_block_component_installer.cc +++ b/components/brave_shields/core/browser/ad_block_component_installer.cc @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_component_installer.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_installer.h" #include #include @@ -176,8 +176,9 @@ void RegisterAdBlockDefaultComponent( component_updater::ComponentUpdateService* cus, OnComponentReadyCallback callback) { // In test, |cus| could be nullptr. - if (!cus) + if (!cus) { return; + } auto installer = base::MakeRefCounted( std::make_unique( @@ -191,8 +192,9 @@ void RegisterAdBlockDefaultResourceComponent( component_updater::ComponentUpdateService* cus, OnComponentReadyCallback callback) { // In test, |cus| could be nullptr. - if (!cus) + if (!cus) { return; + } auto installer = base::MakeRefCounted( std::make_unique( @@ -222,8 +224,9 @@ void RegisterAdBlockFilterListCatalogComponent( component_updater::ComponentUpdateService* cus, OnComponentReadyCallback callback) { // In test, |cus| could be nullptr. - if (!cus) + if (!cus) { return; + } auto installer = base::MakeRefCounted( std::make_unique( @@ -241,8 +244,9 @@ void RegisterAdBlockFiltersComponent( const std::string& component_name, OnComponentReadyCallback callback) { // In test, |cus| could be nullptr. - if (!cus) + if (!cus) { return; + } auto installer = base::MakeRefCounted( std::make_unique( diff --git a/components/brave_shields/browser/ad_block_component_installer.h b/components/brave_shields/core/browser/ad_block_component_installer.h similarity index 83% rename from components/brave_shields/browser/ad_block_component_installer.h rename to components/brave_shields/core/browser/ad_block_component_installer.h index 0212a278d6f..806ffeb6a1e 100644 --- a/components/brave_shields/browser/ad_block_component_installer.h +++ b/components/brave_shields/core/browser/ad_block_component_installer.h @@ -3,8 +3,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_INSTALLER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_INSTALLER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_INSTALLER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_INSTALLER_H_ #include @@ -42,4 +42,4 @@ void RegisterAdBlockFiltersComponent( } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_INSTALLER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_INSTALLER_H_ diff --git a/components/brave_shields/browser/ad_block_component_service_manager.cc b/components/brave_shields/core/browser/ad_block_component_service_manager.cc similarity index 91% rename from components/brave_shields/browser/ad_block_component_service_manager.cc rename to components/brave_shields/core/browser/ad_block_component_service_manager.cc index 1a0487e91e6..e481f9f8a1a 100644 --- a/components/brave_shields/browser/ad_block_component_service_manager.cc +++ b/components/brave_shields/core/browser/ad_block_component_service_manager.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_component_service_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h" #include #include @@ -13,12 +13,12 @@ #include "base/memory/raw_ref.h" #include "base/metrics/histogram_macros.h" #include "base/values.h" -#include "brave/components/brave_shields/browser/ad_block_component_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" -#include "brave/components/brave_shields/common/pref_names.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" +#include "brave/components/brave_shields/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" @@ -202,7 +202,8 @@ bool AdBlockComponentServiceManager::IsFilterListEnabled( return false; } // prefer any user setting for a default-enabled list, unless it's hidden - if (catalog_entry->default_enabled && (!list_touched || catalog_entry->hidden)) { + if (catalog_entry->default_enabled && + (!list_touched || catalog_entry->hidden)) { return true; } } diff --git a/components/brave_shields/browser/ad_block_component_service_manager.h b/components/brave_shields/core/browser/ad_block_component_service_manager.h similarity index 80% rename from components/brave_shields/browser/ad_block_component_service_manager.h rename to components/brave_shields/core/browser/ad_block_component_service_manager.h index 86eb1f10abf..c25055ae020 100644 --- a/components/brave_shields/browser/ad_block_component_service_manager.h +++ b/components/brave_shields/core/browser/ad_block_component_service_manager.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_SERVICE_MANAGER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_SERVICE_MANAGER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_SERVICE_MANAGER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_SERVICE_MANAGER_H_ #include #include @@ -15,8 +15,8 @@ #include "base/sequence_checker.h" #include "base/thread_annotations.h" #include "base/values.h" -#include "brave/components/brave_shields/browser/ad_block_component_filters_provider.h" -#include "brave/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.h" #include "components/prefs/pref_service.h" class AdBlockServiceTest; @@ -91,4 +91,4 @@ class AdBlockComponentServiceManager } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_COMPONENT_SERVICE_MANAGER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_COMPONENT_SERVICE_MANAGER_H_ diff --git a/components/brave_shields/browser/ad_block_filter_list_catalog_provider.cc b/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.cc similarity index 84% rename from components/brave_shields/browser/ad_block_filter_list_catalog_provider.cc rename to components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.cc index e93847b8a4f..96e39958cd2 100644 --- a/components/brave_shields/browser/ad_block_filter_list_catalog_provider.cc +++ b/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.cc @@ -1,15 +1,16 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +#include "brave/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.h" #include #include #include "base/files/file_path.h" #include "base/task/thread_pool.h" -#include "brave/components/brave_shields/browser/ad_block_component_installer.h" -#include "brave/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_installer.h" constexpr char kListCatalogFile[] = "list_catalog.json"; diff --git a/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h b/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.h similarity index 72% rename from components/brave_shields/browser/ad_block_filter_list_catalog_provider.h rename to components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.h index 7e6b53cbe7c..92d0beb255e 100644 --- a/components/brave_shields/browser/ad_block_filter_list_catalog_provider.h +++ b/components/brave_shields/core/browser/ad_block_filter_list_catalog_provider.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTER_LIST_CATALOG_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTER_LIST_CATALOG_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTER_LIST_CATALOG_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTER_LIST_CATALOG_PROVIDER_H_ #include @@ -57,4 +57,4 @@ class AdBlockFilterListCatalogProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTER_LIST_CATALOG_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTER_LIST_CATALOG_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_filters_provider.cc b/components/brave_shields/core/browser/ad_block_filters_provider.cc similarity index 65% rename from components/brave_shields/browser/ad_block_filters_provider.cc rename to components/brave_shields/core/browser/ad_block_filters_provider.cc index 0e494071d44..9e4c2dc8c96 100644 --- a/components/brave_shields/browser/ad_block_filters_provider.cc +++ b/components/brave_shields/core/browser/ad_block_filters_provider.cc @@ -1,13 +1,14 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" #include -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_component_updater/browser/dat_file_util.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" namespace brave_shields { @@ -26,14 +27,16 @@ AdBlockFiltersProvider::~AdBlockFiltersProvider() { void AdBlockFiltersProvider::AddObserver( AdBlockFiltersProvider::Observer* observer) { - if (!observers_.HasObserver(observer)) + if (!observers_.HasObserver(observer)) { observers_.AddObserver(observer); + } } void AdBlockFiltersProvider::RemoveObserver( AdBlockFiltersProvider::Observer* observer) { - if (observers_.HasObserver(observer)) + if (observers_.HasObserver(observer)) { observers_.RemoveObserver(observer); + } } void AdBlockFiltersProvider::NotifyObservers(bool is_for_default_engine) { diff --git a/components/brave_shields/browser/ad_block_filters_provider.h b/components/brave_shields/core/browser/ad_block_filters_provider.h similarity index 76% rename from components/brave_shields/browser/ad_block_filters_provider.h rename to components/brave_shields/core/browser/ad_block_filters_provider.h index 3d9f6e39f50..77f8e769e4f 100644 --- a/components/brave_shields/browser/ad_block_filters_provider.h +++ b/components/brave_shields/core/browser/ad_block_filters_provider.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTERS_PROVIDER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTERS_PROVIDER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTERS_PROVIDER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTERS_PROVIDER_H_ #include @@ -58,4 +58,4 @@ class AdBlockFiltersProvider { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTERS_PROVIDER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTERS_PROVIDER_H_ diff --git a/components/brave_shields/browser/ad_block_filters_provider_manager.cc b/components/brave_shields/core/browser/ad_block_filters_provider_manager.cc similarity index 91% rename from components/brave_shields/browser/ad_block_filters_provider_manager.cc rename to components/brave_shields/core/browser/ad_block_filters_provider_manager.cc index 8a66b85377b..f954030d01e 100644 --- a/components/brave_shields/browser/ad_block_filters_provider_manager.cc +++ b/components/brave_shields/core/browser/ad_block_filters_provider_manager.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_filters_provider_manager.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider_manager.h" #include #include diff --git a/components/brave_shields/browser/ad_block_filters_provider_manager.h b/components/brave_shields/core/browser/ad_block_filters_provider_manager.h similarity index 82% rename from components/brave_shields/browser/ad_block_filters_provider_manager.h rename to components/brave_shields/core/browser/ad_block_filters_provider_manager.h index 61fe9e0a36e..6c4fffdf728 100644 --- a/components/brave_shields/browser/ad_block_filters_provider_manager.h +++ b/components/brave_shields/core/browser/ad_block_filters_provider_manager.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTERS_PROVIDER_MANAGER_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTERS_PROVIDER_MANAGER_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTERS_PROVIDER_MANAGER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTERS_PROVIDER_MANAGER_H_ #include #include @@ -14,7 +14,7 @@ #include "base/task/cancelable_task_tracker.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" #include "brave/components/brave_shields/adblock/rs/src/lib.rs.h" -#include "brave/components/brave_shields/browser/ad_block_filters_provider.h" +#include "brave/components/brave_shields/core/browser/ad_block_filters_provider.h" using brave_component_updater::DATFileDataBuffer; @@ -83,4 +83,4 @@ class AdBlockFiltersProviderManager : public AdBlockFiltersProvider, } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_FILTERS_PROVIDER_MANAGER_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_FILTERS_PROVIDER_MANAGER_H_ diff --git a/components/brave_shields/browser/ad_block_service_helper.cc b/components/brave_shields/core/browser/ad_block_service_helper.cc similarity index 91% rename from components/brave_shields/browser/ad_block_service_helper.cc rename to components/brave_shields/core/browser/ad_block_service_helper.cc index eeaaa965f1d..b7b53a22217 100644 --- a/components/brave_shields/browser/ad_block_service_helper.cc +++ b/components/brave_shields/core/browser/ad_block_service_helper.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" #include #include diff --git a/components/brave_shields/core/browser/ad_block_service_helper.h b/components/brave_shields/core/browser/ad_block_service_helper.h new file mode 100644 index 00000000000..78f7830b736 --- /dev/null +++ b/components/brave_shields/core/browser/ad_block_service_helper.h @@ -0,0 +1,28 @@ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ + +#include + +#include +#include +#include + +#include "base/values.h" + +namespace brave_shields { + +void MergeCspDirectiveInto(std::optional from, + std::optional* into); + +void MergeResourcesInto(base::Value::Dict from, + base::Value::Dict& into, + bool force_hide); + +} // namespace brave_shields + +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_AD_BLOCK_SERVICE_HELPER_H_ diff --git a/components/brave_shields/browser/filter_list_catalog_entry.cc b/components/brave_shields/core/browser/filter_list_catalog_entry.cc similarity index 95% rename from components/brave_shields/browser/filter_list_catalog_entry.cc rename to components/brave_shields/core/browser/filter_list_catalog_entry.cc index f653aa6e41b..3101a8e3ae2 100644 --- a/components/brave_shields/browser/filter_list_catalog_entry.cc +++ b/components/brave_shields/core/browser/filter_list_catalog_entry.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" #include #include diff --git a/components/brave_shields/browser/filter_list_catalog_entry.h b/components/brave_shields/core/browser/filter_list_catalog_entry.h similarity index 83% rename from components/brave_shields/browser/filter_list_catalog_entry.h rename to components/brave_shields/core/browser/filter_list_catalog_entry.h index fc2a297ada0..8f4a4284e46 100644 --- a/components/brave_shields/browser/filter_list_catalog_entry.h +++ b/components/brave_shields/core/browser/filter_list_catalog_entry.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2022 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_CATALOG_ENTRY_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_CATALOG_ENTRY_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_FILTER_LIST_CATALOG_ENTRY_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_FILTER_LIST_CATALOG_ENTRY_H_ #include #include @@ -77,4 +77,4 @@ std::vector FilterListCatalogFromJSON( } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_CATALOG_ENTRY_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_BROWSER_FILTER_LIST_CATALOG_ENTRY_H_ diff --git a/components/brave_shields/common/BUILD.gn b/components/brave_shields/core/common/BUILD.gn similarity index 100% rename from components/brave_shields/common/BUILD.gn rename to components/brave_shields/core/common/BUILD.gn diff --git a/components/brave_shields/common/brave_shield_constants.h b/components/brave_shields/core/common/brave_shield_constants.h similarity index 76% rename from components/brave_shields/common/brave_shield_constants.h rename to components/brave_shields/core/common/brave_shield_constants.h index f216dc6b0ec..7f87a0aeccc 100644 --- a/components/brave_shields/common/brave_shield_constants.h +++ b/components/brave_shields/core/common/brave_shield_constants.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2019 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. - -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_CONSTANTS_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_CONSTANTS_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_CONSTANTS_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_CONSTANTS_H_ #include "base/files/file_path.h" @@ -47,4 +46,4 @@ const char kCookieListPromptHistogram[] = "Brave.Shields.CookieListPrompt"; } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_CONSTANTS_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_CONSTANTS_H_ diff --git a/components/brave_shields/common/brave_shield_localized_strings.h b/components/brave_shields/core/common/brave_shield_localized_strings.h similarity index 87% rename from components/brave_shields/common/brave_shield_localized_strings.h rename to components/brave_shields/core/common/brave_shield_localized_strings.h index 651b03c9c4f..b94a6344881 100644 --- a/components/brave_shields/common/brave_shield_localized_strings.h +++ b/components/brave_shields/core/common/brave_shield_localized_strings.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2023 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_LOCALIZED_STRINGS_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_LOCALIZED_STRINGS_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_LOCALIZED_STRINGS_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_LOCALIZED_STRINGS_H_ #include "components/grit/brave_components_strings.h" #include "ui/base/webui/web_ui_util.h" @@ -74,4 +74,4 @@ inline constexpr webui::LocalizedString kLocalizedStrings[] = { } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_LOCALIZED_STRINGS_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_LOCALIZED_STRINGS_H_ diff --git a/components/brave_shields/common/brave_shield_utils.cc b/components/brave_shields/core/common/brave_shield_utils.cc similarity index 85% rename from components/brave_shields/common/brave_shield_utils.cc rename to components/brave_shields/core/common/brave_shield_utils.cc index 6f51a65d257..8d51d170a1f 100644 --- a/components/brave_shields/common/brave_shield_utils.cc +++ b/components/brave_shields/core/common/brave_shield_utils.cc @@ -1,9 +1,9 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2020 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/common/brave_shield_utils.h" +#include "brave/components/brave_shields/core/common/brave_shield_utils.h" #include #include @@ -22,8 +22,9 @@ ContentSetting GetBraveFPContentSettingFromRules( ContentSettingsPattern::FromString("https://balanced")); ContentSettingPatternSource fp_rule; for (const auto& rule : fp_rules) { - if (rule.secondary_pattern == *kBalancedRule) + if (rule.secondary_pattern == *kBalancedRule) { continue; + } if (rule.primary_pattern.Matches(primary_url)) { return rule.GetContentSetting(); } diff --git a/components/brave_shields/common/brave_shield_utils.h b/components/brave_shields/core/common/brave_shield_utils.h similarity index 54% rename from components/brave_shields/common/brave_shield_utils.h rename to components/brave_shields/core/common/brave_shield_utils.h index 0fcf44f8f8b..0fe22406e6e 100644 --- a/components/brave_shields/common/brave_shield_utils.h +++ b/components/brave_shields/core/common/brave_shield_utils.h @@ -1,10 +1,10 @@ -/* Copyright 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2020 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_UTILS_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_UTILS_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_UTILS_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_UTILS_H_ #include "components/content_settings/core/common/content_settings.h" @@ -28,4 +28,4 @@ ShieldsSettingCounts GetAdsSettingCountFromRules( const ContentSettingsForOneType& ads_rules); } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_BRAVE_SHIELD_UTILS_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_BRAVE_SHIELD_UTILS_H_ diff --git a/components/brave_shields/common/brave_shields.mojom b/components/brave_shields/core/common/brave_shields.mojom similarity index 100% rename from components/brave_shields/common/brave_shields.mojom rename to components/brave_shields/core/common/brave_shields.mojom diff --git a/components/brave_shields/common/brave_shields_panel.mojom b/components/brave_shields/core/common/brave_shields_panel.mojom similarity index 97% rename from components/brave_shields/common/brave_shields_panel.mojom rename to components/brave_shields/core/common/brave_shields_panel.mojom index a6cac7751af..1642ef25c2f 100644 --- a/components/brave_shields/common/brave_shields_panel.mojom +++ b/components/brave_shields/core/common/brave_shields_panel.mojom @@ -1,7 +1,7 @@ // Copyright (c) 2021 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. module brave_shields.mojom; diff --git a/components/brave_shields/common/cookie_list_opt_in.mojom b/components/brave_shields/core/common/cookie_list_opt_in.mojom similarity index 91% rename from components/brave_shields/common/cookie_list_opt_in.mojom rename to components/brave_shields/core/common/cookie_list_opt_in.mojom index f2ae5da02d0..e4f09179ba8 100644 --- a/components/brave_shields/common/cookie_list_opt_in.mojom +++ b/components/brave_shields/core/common/cookie_list_opt_in.mojom @@ -1,7 +1,7 @@ // Copyright (c) 2022 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. module brave_shields.mojom; diff --git a/components/brave_shields/common/features.cc b/components/brave_shields/core/common/features.cc similarity index 98% rename from components/brave_shields/common/features.cc rename to components/brave_shields/core/common/features.cc index 0146540436d..0efe5fa9e2d 100644 --- a/components/brave_shields/common/features.cc +++ b/components/brave_shields/core/common/features.cc @@ -1,9 +1,9 @@ // Copyright (c) 2020 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "base/feature_list.h" diff --git a/components/brave_shields/common/features.h b/components/brave_shields/core/common/features.h similarity index 88% rename from components/brave_shields/common/features.h rename to components/brave_shields/core/common/features.h index c4990c9ab4d..cefefbecd88 100644 --- a/components/brave_shields/common/features.h +++ b/components/brave_shields/core/common/features.h @@ -1,10 +1,10 @@ // Copyright (c) 2020 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_FEATURES_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_FEATURES_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_FEATURES_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_FEATURES_H_ #include @@ -47,4 +47,4 @@ extern const base::FeatureParam } // namespace features } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_FEATURES_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_FEATURES_H_ diff --git a/components/brave_shields/common/filter_list.mojom b/components/brave_shields/core/common/filter_list.mojom similarity index 93% rename from components/brave_shields/common/filter_list.mojom rename to components/brave_shields/core/common/filter_list.mojom index 2ee53e055cf..d1f2f0631e2 100644 --- a/components/brave_shields/common/filter_list.mojom +++ b/components/brave_shields/core/common/filter_list.mojom @@ -34,8 +34,7 @@ interface FilterListAndroidHandler { const string kSwitchToAppUuid = "2F3DCE16-A19A-493C-A88F-2E110FBD37D6"; const string kCookieListUuid = "AC023D22-AE88-4060-A978-4FEEEC4221693"; -const string kHideYoutubeRecommendedContentUuid +const string kHideYoutubeRecommendedContentUuid = "2D57ADED-3531-419A-9DED-7F8868BC1561"; -const string kHideYoutubeDistractingElementsUuid +const string kHideYoutubeDistractingElementsUuid = "BD308B90-D3BB-4041-9114-22E096B0BA77"; - diff --git a/components/brave_shields/common/pref_names.h b/components/brave_shields/core/common/pref_names.h similarity index 74% rename from components/brave_shields/common/pref_names.h rename to components/brave_shields/core/common/pref_names.h index 20be2a81d66..bbe3a4a999a 100644 --- a/components/brave_shields/common/pref_names.h +++ b/components/brave_shields/core/common/pref_names.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2021 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_PREF_NAMES_H_ -#define BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_PREF_NAMES_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_PREF_NAMES_H_ +#define BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_PREF_NAMES_H_ namespace brave_shields { namespace prefs { @@ -35,4 +35,4 @@ inline constexpr char kReduceLanguageEnabled[] = "brave.reduce_language"; } // namespace prefs } // namespace brave_shields -#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_COMMON_PREF_NAMES_H_ +#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_CORE_COMMON_PREF_NAMES_H_ diff --git a/components/brave_shields/core/test/BUILD.gn b/components/brave_shields/core/test/BUILD.gn new file mode 100644 index 00000000000..dc60371e627 --- /dev/null +++ b/components/brave_shields/core/test/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright (c) 2024 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + +import("//testing/test.gni") + +source_set("unit_tests") { + testonly = true + + sources = [ "ad_block_component_service_unittest.cc" ] + deps = [ + "//brave/components/brave_shields/core/browser", + "//testing/gtest", + ] +} diff --git a/components/brave_shields/browser/ad_block_component_service_unittest.cc b/components/brave_shields/core/test/ad_block_component_service_unittest.cc similarity index 88% rename from components/brave_shields/browser/ad_block_component_service_unittest.cc rename to components/brave_shields/core/test/ad_block_component_service_unittest.cc index 52d53c8403a..5b98ba80529 100644 --- a/components/brave_shields/browser/ad_block_component_service_unittest.cc +++ b/components/brave_shields/core/test/ad_block_component_service_unittest.cc @@ -1,9 +1,9 @@ -/* Copyright (c) 2023 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ +// Copyright (c) 2023 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" #include "testing/gtest/include/gtest/gtest.h" TEST(AdBlockComponentServiceTest, UserModelLanguages) { diff --git a/components/brave_shields/resources/cookie_list_opt_in/BUILD.gn b/components/brave_shields/resources/cookie_list_opt_in/BUILD.gn index 057f73309d0..ff63910a753 100644 --- a/components/brave_shields/resources/cookie_list_opt_in/BUILD.gn +++ b/components/brave_shields/resources/cookie_list_opt_in/BUILD.gn @@ -12,7 +12,7 @@ transpile_web_ui("cookie_list_opt_in_ui") { rebase_path("cookie_list_opt_in.tsx"), ] ] resource_name = "cookie_list_opt_in" - deps = [ "//brave/components/brave_shields/common:mojom_js" ] + deps = [ "//brave/components/brave_shields/core/common:mojom_js" ] } pack_web_resources("cookie_list_opt_in_generated") { diff --git a/components/brave_shields/resources/cookie_list_opt_in/api/cookie_list_opt_in_proxy.ts b/components/brave_shields/resources/cookie_list_opt_in/api/cookie_list_opt_in_proxy.ts index d076c75a7ad..57cf1112d4f 100644 --- a/components/brave_shields/resources/cookie_list_opt_in/api/cookie_list_opt_in_proxy.ts +++ b/components/brave_shields/resources/cookie_list_opt_in/api/cookie_list_opt_in_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import * as mojom from 'gen/brave/components/brave_shields/common/cookie_list_opt_in.mojom.m.js' +import * as mojom from 'gen/brave/components/brave_shields/core/common/cookie_list_opt_in.mojom.m.js' let instance: CookieListOptInProxy | null = null diff --git a/components/brave_shields/resources/panel/BUILD.gn b/components/brave_shields/resources/panel/BUILD.gn index c37574ae51f..e87f4679f99 100644 --- a/components/brave_shields/resources/panel/BUILD.gn +++ b/components/brave_shields/resources/panel/BUILD.gn @@ -12,7 +12,7 @@ transpile_web_ui("brave_shields_panel_ui") { rebase_path("shields_panel.tsx"), ] ] resource_name = "brave_shields_panel" - deps = [ "//brave/components/brave_shields/common:mojom_js" ] + deps = [ "//brave/components/brave_shields/core/common:mojom_js" ] } pack_web_resources("brave_shields_panel_generated") { diff --git a/components/brave_shields/resources/panel/api/panel_browser_api.ts b/components/brave_shields/resources/panel/api/panel_browser_api.ts index 31e97635990..a72fec92ccc 100644 --- a/components/brave_shields/resources/panel/api/panel_browser_api.ts +++ b/components/brave_shields/resources/panel/api/panel_browser_api.ts @@ -3,9 +3,9 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import * as BraveShields from 'gen/brave/components/brave_shields/common/brave_shields_panel.mojom.m.js' +import * as BraveShields from 'gen/brave/components/brave_shields/core/common/brave_shields_panel.mojom.m.js' // Provide access to all the generated types -export * from 'gen/brave/components/brave_shields/common/brave_shields_panel.mojom.m.js' +export * from 'gen/brave/components/brave_shields/core/common/brave_shields_panel.mojom.m.js' interface API { panelHandler: BraveShields.PanelHandlerRemote diff --git a/components/brave_wallet/browser/android_page_appearing_browsertest.cc b/components/brave_wallet/browser/android_page_appearing_browsertest.cc index fe5661c8db3..6c5d9ae6d20 100644 --- a/components/brave_wallet/browser/android_page_appearing_browsertest.cc +++ b/components/brave_wallet/browser/android_page_appearing_browsertest.cc @@ -17,7 +17,7 @@ #include "brave/browser/brave_wallet/json_rpc_service_factory.h" #include "brave/browser/brave_wallet/keyring_service_factory.h" #include "brave/browser/ui/webui/brave_wallet/android/android_wallet_page_ui.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" #include "brave/components/brave_wallet/browser/asset_ratio_service.h" #include "brave/components/brave_wallet/browser/blockchain_registry.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc index 0ece398bac5..2aca8f05463 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc @@ -18,7 +18,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/constants/pref_names.h" #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" #include "brave/components/content_settings/core/common/content_settings_util.h" diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc index 94298d9b3d2..f311e788edb 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc @@ -13,7 +13,7 @@ #include "base/json/values_util.h" #include "base/memory/raw_ptr.h" #include "base/values.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/components/constants/pref_names.h" #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" #include "chrome/test/base/testing_profile.h" diff --git a/components/content_settings/core/browser/brave_content_settings_utils.cc b/components/content_settings/core/browser/brave_content_settings_utils.cc index 0e57b2f4a99..fc3d3628304 100644 --- a/components/content_settings/core/browser/brave_content_settings_utils.cc +++ b/components/content_settings/core/browser/brave_content_settings_utils.cc @@ -13,7 +13,7 @@ #include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "url/gurl.h" namespace { diff --git a/components/content_settings/core/browser/sources.gni b/components/content_settings/core/browser/sources.gni index a2a8fd296ce..e45df634ba9 100644 --- a/components/content_settings/core/browser/sources.gni +++ b/components/content_settings/core/browser/sources.gni @@ -18,7 +18,7 @@ if (!is_ios) { brave_components_content_settings_core_browser_deps += [ "//base", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/core/common", "//brave/components/constants", "//brave/components/content_settings/core/common", "//brave/components/google_sign_in_permission", diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl.cc b/components/content_settings/renderer/brave_content_settings_agent_impl.cc index a1b631a7120..b78fc6af5be 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl.cc @@ -15,8 +15,8 @@ #include "base/feature_list.h" #include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" -#include "brave/components/brave_shields/common/brave_shield_utils.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/brave_shield_utils.h" +#include "brave/components/brave_shields/core/common/features.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_utils.h" #include "content/public/renderer/render_frame.h" diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl.h b/components/content_settings/renderer/brave_content_settings_agent_impl.h index 20d8afee23f..c264f7c251b 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl.h +++ b/components/content_settings/renderer/brave_content_settings_agent_impl.h @@ -14,7 +14,7 @@ #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/gtest_prod_util.h" -#include "brave/components/brave_shields/common/brave_shields.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields.mojom.h" #include "brave/third_party/blink/renderer/brave_farbling_constants.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc b/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc index b5c20af42a9..050b8457d0a 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc @@ -8,9 +8,9 @@ #include "base/feature_list.h" #include "base/path_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/brave_paths.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/components/content_settings/renderer/sources.gni b/components/content_settings/renderer/sources.gni index b4e58b4892e..80053eb7a56 100644 --- a/components/content_settings/renderer/sources.gni +++ b/components/content_settings/renderer/sources.gni @@ -9,7 +9,7 @@ brave_components_content_settings_renderer_sources = [ ] brave_components_content_settings_renderer_deps = [ - "//brave/components/brave_shields/common", - "//brave/components/brave_shields/common:mojom", + "//brave/components/brave_shields/core/common", + "//brave/components/brave_shields/core/common:mojom", "//brave/third_party/blink/renderer", ] diff --git a/components/cosmetic_filters/browser/BUILD.gn b/components/cosmetic_filters/browser/BUILD.gn index a7b5060ceaa..96d538df446 100644 --- a/components/cosmetic_filters/browser/BUILD.gn +++ b/components/cosmetic_filters/browser/BUILD.gn @@ -1,3 +1,8 @@ +# Copyright (c) 2021 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + import("//build/config/features.gni") static_library("browser") { @@ -8,7 +13,7 @@ static_library("browser") { deps = [ "//base", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/cosmetic_filters/common:mojom", "//components/content_settings/core/browser", ] diff --git a/components/cosmetic_filters/browser/cosmetic_filters_resources.cc b/components/cosmetic_filters/browser/cosmetic_filters_resources.cc index 28a9e40e873..db925e255dc 100644 --- a/components/cosmetic_filters/browser/cosmetic_filters_resources.cc +++ b/components/cosmetic_filters/browser/cosmetic_filters_resources.cc @@ -10,8 +10,8 @@ #include "base/json/json_reader.h" #include "base/values.h" -#include "brave/components/brave_shields/browser/ad_block_service.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "components/content_settings/core/browser/host_content_settings_map.h" namespace cosmetic_filters { diff --git a/components/cosmetic_filters/renderer/BUILD.gn b/components/cosmetic_filters/renderer/BUILD.gn index aadaf2e795c..df05478cb5a 100644 --- a/components/cosmetic_filters/renderer/BUILD.gn +++ b/components/cosmetic_filters/renderer/BUILD.gn @@ -1,3 +1,8 @@ +# Copyright (c) 2020 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + import("//build/config/features.gni") source_set("renderer") { @@ -18,7 +23,7 @@ source_set("renderer") { deps = [ "//base", "//brave/common:mojo_bindings", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/core/common", "//brave/components/cosmetic_filters/common:mojom", "//brave/components/cosmetic_filters/resources/data:generated_resources", "//brave/components/de_amp/common", diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc index d2d8e8ea77b..d5f7fa71533 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc @@ -16,7 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/content_settings/renderer/brave_content_settings_agent_impl.h" #include "brave/components/cosmetic_filters/resources/grit/cosmetic_filters_generated_map.h" #include "components/content_settings/renderer/content_settings_agent_impl.h" diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc index 83894cb4bf9..974f660acea 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc @@ -11,7 +11,7 @@ #include "base/feature_list.h" #include "base/functional/bind.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/de_amp/common/features.h" #include "content/public/renderer/render_frame.h" #include "third_party/blink/public/platform/web_isolated_world_info.h" diff --git a/components/debounce/content/browser/BUILD.gn b/components/debounce/content/browser/BUILD.gn index ba0b84c02f0..7831b9088e6 100644 --- a/components/debounce/content/browser/BUILD.gn +++ b/components/debounce/content/browser/BUILD.gn @@ -13,7 +13,7 @@ source_set("browser") { deps = [ "//base", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", "//brave/components/debounce/core/browser", "//components/user_prefs", "//content/public/browser", diff --git a/components/request_otr/browser/BUILD.gn b/components/request_otr/browser/BUILD.gn index 42541816186..1d8e0885034 100644 --- a/components/request_otr/browser/BUILD.gn +++ b/components/request_otr/browser/BUILD.gn @@ -34,7 +34,7 @@ source_set("browser") { deps += [ "//base", "//brave/components/brave_component_updater/browser", - "//brave/components/brave_shields/browser:browser", + "//brave/components/brave_shields/content/browser", "//brave/components/l10n/common:common", "//brave/components/p3a_utils", "//brave/components/request_otr/common:common", diff --git a/components/request_otr/browser/request_otr_navigation_throttle.h b/components/request_otr/browser/request_otr_navigation_throttle.h index 05e359dd2ab..e36d2e7d1ef 100644 --- a/components/request_otr/browser/request_otr_navigation_throttle.h +++ b/components/request_otr/browser/request_otr_navigation_throttle.h @@ -12,7 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "brave/components/brave_shields/browser/brave_shields_util.h" +#include "brave/components/brave_shields/content/browser/brave_shields_util.h" #include "content/public/browser/navigation_throttle.h" #include "url/gurl.h" diff --git a/components/request_otr/browser/request_otr_storage_tab_helper.h b/components/request_otr/browser/request_otr_storage_tab_helper.h index e1dfc7388fa..626cbf2af15 100644 --- a/components/request_otr/browser/request_otr_storage_tab_helper.h +++ b/components/request_otr/browser/request_otr_storage_tab_helper.h @@ -7,7 +7,7 @@ #define BRAVE_COMPONENTS_REQUEST_OTR_BROWSER_REQUEST_OTR_STORAGE_TAB_HELPER_H_ #include "base/memory/ref_counted.h" -#include "brave/components/brave_shields/browser/blocked_domain_1pes_lifetime.h" +#include "brave/components/brave_shields/content/browser/blocked_domain_1pes_lifetime.h" #include "content/public/browser/web_contents_user_data.h" using brave_shields::BlockedDomain1PESLifetime; diff --git a/components/webcompat_reporter/browser/BUILD.gn b/components/webcompat_reporter/browser/BUILD.gn index 9031aeaa3cb..83e84b6f19c 100644 --- a/components/webcompat_reporter/browser/BUILD.gn +++ b/components/webcompat_reporter/browser/BUILD.gn @@ -18,7 +18,7 @@ static_library("browser") { deps = [ "//base", "//brave/components/brave_referrals/browser", - "//brave/components/brave_shields/common:mojom", + "//brave/components/brave_shields/core/common:mojom", "//brave/components/brave_stats/browser", "//brave/components/constants", "//brave/components/webcompat_reporter/buildflags", diff --git a/components/webcompat_reporter/browser/fields.cc b/components/webcompat_reporter/browser/fields.cc index 629be4dab3f..aea0383a9bb 100644 --- a/components/webcompat_reporter/browser/fields.cc +++ b/components/webcompat_reporter/browser/fields.cc @@ -6,7 +6,7 @@ #include "brave/components/webcompat_reporter/browser/fields.h" #include "base/notreached.h" -#include "brave/components/brave_shields/common/brave_shields_panel.mojom-shared.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom-shared.h" namespace webcompat_reporter { diff --git a/components/webcompat_reporter/browser/fields.h b/components/webcompat_reporter/browser/fields.h index 477bcb6673c..9a34e07879e 100644 --- a/components/webcompat_reporter/browser/fields.h +++ b/components/webcompat_reporter/browser/fields.h @@ -6,7 +6,7 @@ #ifndef BRAVE_COMPONENTS_WEBCOMPAT_REPORTER_BROWSER_FIELDS_H_ #define BRAVE_COMPONENTS_WEBCOMPAT_REPORTER_BROWSER_FIELDS_H_ -#include "brave/components/brave_shields/common/brave_shields_panel.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h" namespace webcompat_reporter { diff --git a/components/webcompat_reporter/browser/webcompat_report_uploader.h b/components/webcompat_reporter/browser/webcompat_report_uploader.h index 51d88e9229a..8e23f709c5d 100644 --- a/components/webcompat_reporter/browser/webcompat_report_uploader.h +++ b/components/webcompat_reporter/browser/webcompat_report_uploader.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/values.h" -#include "brave/components/brave_shields/common/brave_shields.mojom.h" +#include "brave/components/brave_shields/core/common/brave_shields.mojom.h" #include "url/gurl.h" namespace network { diff --git a/ios/browser/api/brave_shields/BUILD.gn b/ios/browser/api/brave_shields/BUILD.gn index 0c9b9158c37..38d9ca3cac9 100644 --- a/ios/browser/api/brave_shields/BUILD.gn +++ b/ios/browser/api/brave_shields/BUILD.gn @@ -19,8 +19,8 @@ source_set("brave_shields") { "//brave/base/mac", "//brave/components/brave_component_updater/browser", "//brave/components/brave_shields/adblock:rust_lib", - "//brave/components/brave_shields/browser:component_installer", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/core/browser", + "//brave/components/brave_shields/core/common", "//components/component_updater", ] } diff --git a/ios/browser/api/brave_shields/adblock_filter_list_catalog_entry.mm b/ios/browser/api/brave_shields/adblock_filter_list_catalog_entry.mm index 71712d9bbf6..bdefdda08f9 100644 --- a/ios/browser/api/brave_shields/adblock_filter_list_catalog_entry.mm +++ b/ios/browser/api/brave_shields/adblock_filter_list_catalog_entry.mm @@ -7,7 +7,7 @@ #include "base/strings/sys_string_conversions.h" #include "brave/base/mac/conversions.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" @interface AdblockFilterListCatalogEntry () @property(nonatomic, copy) NSString* uuid; diff --git a/ios/browser/api/brave_shields/adblock_service.mm b/ios/browser/api/brave_shields/adblock_service.mm index 4b6695cf77b..fda6619fec8 100644 --- a/ios/browser/api/brave_shields/adblock_service.mm +++ b/ios/browser/api/brave_shields/adblock_service.mm @@ -8,9 +8,9 @@ #include "base/strings/sys_string_conversions.h" #include "base/task/thread_pool.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" -#include "brave/components/brave_shields/browser/ad_block_component_installer.h" -#include "brave/components/brave_shields/browser/ad_block_service_helper.h" -#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h" +#include "brave/components/brave_shields/core/browser/ad_block_component_installer.h" +#include "brave/components/brave_shields/core/browser/ad_block_service_helper.h" +#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.h" #include "brave/ios/browser/api/brave_shields/adblock_filter_list_catalog_entry+private.h" #include "components/component_updater/component_updater_service.h" diff --git a/renderer/BUILD.gn b/renderer/BUILD.gn index 1f4bd27deed..31a565195e6 100644 --- a/renderer/BUILD.gn +++ b/renderer/BUILD.gn @@ -21,7 +21,7 @@ source_set("renderer") { deps = [ "//brave/components/brave_search/common", "//brave/components/brave_search/renderer", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/core/common", "//brave/components/brave_wallet/renderer", "//brave/components/cosmetic_filters/renderer", "//brave/renderer/brave_wallet/", diff --git a/renderer/brave_content_renderer_client.cc b/renderer/brave_content_renderer_client.cc index 180b8beac87..8e9ab582db5 100644 --- a/renderer/brave_content_renderer_client.cc +++ b/renderer/brave_content_renderer_client.cc @@ -12,7 +12,7 @@ #include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_search/common/brave_search_utils.h" #include "brave/components/brave_search/renderer/brave_search_render_frame_observer.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/common/features.h" #include "brave/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.h" diff --git a/renderer/sources.gni b/renderer/sources.gni index 0ad7ba4582d..e5fe3724e1d 100644 --- a/renderer/sources.gni +++ b/renderer/sources.gni @@ -24,7 +24,7 @@ brave_chrome_renderer_deps = [ "//brave/components/ai_chat/core/common/buildflags", "//brave/components/brave_search/common", "//brave/components/brave_search/renderer", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/core/common", "//brave/components/brave_vpn/common/buildflags", "//brave/components/brave_wallet/common", "//brave/components/brave_wallet/renderer", diff --git a/test/BUILD.gn b/test/BUILD.gn index 5e174b535ae..5ceadafcaba 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -43,7 +43,8 @@ static_library("test_support") { deps = [ "//brave/browser", - "//brave/components/brave_shields/browser", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/content/test:test_support", "//brave/components/brave_vpn/common/buildflags", "//brave/components/ipfs/buildflags", "//brave/components/tor/buildflags", @@ -131,12 +132,6 @@ test("brave_unit_tests") { "//brave/components/brave_private_cdn/private_cdn_helper_unittest.cc", "//brave/components/brave_search/browser/brave_search_default_host_unittest.cc", "//brave/components/brave_search/browser/brave_search_fallback_host_unittest.cc", - "//brave/components/brave_shields/browser/ad_block_component_service_unittest.cc", - "//brave/components/brave_shields/browser/adblock_stub_response_unittest.cc", - "//brave/components/brave_shields/browser/brave_farbling_service_unittest.cc", - "//brave/components/brave_shields/browser/cookie_list_opt_in_service_unittest.cc", - "//brave/components/brave_shields/browser/cosmetic_merge_unittest.cc", - "//brave/components/brave_shields/browser/csp_merge_unittest.cc", "//brave/components/brave_sync/crypto/crypto_unittest.cc", "//brave/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc", "//brave/components/content_settings/core/browser/brave_content_settings_utils_unittest.cc", @@ -215,10 +210,12 @@ test("brave_unit_tests") { "//brave/components/brave_search_conversion", "//brave/components/brave_search_conversion:unit_tests", "//brave/components/brave_service_keys:unit_tests", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/browser:test_support", - "//brave/components/brave_shields/common", - "//brave/components/brave_shields/common:mojom", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/content/test:test_support", + "//brave/components/brave_shields/content/test:unit_tests", + "//brave/components/brave_shields/core/common", + "//brave/components/brave_shields/core/common:mojom", + "//brave/components/brave_shields/core/test:unit_tests", "//brave/components/brave_sync:crypto", "//brave/components/brave_sync:network_time_helper", "//brave/components/brave_sync:unit_tests", @@ -429,8 +426,6 @@ test("brave_unit_tests") { "//brave/chromium_src/components/search_engines/brave_template_url_prepopulate_data_unittest.cc", "//brave/chromium_src/components/search_engines/brave_template_url_service_util_unittest.cc", "//brave/chromium_src/components/translate/core/browser/translate_manager_unittest.cc", - "//brave/components/brave_shields/browser/brave_shields_p3a_unittest.cc", - "//brave/components/brave_shields/browser/brave_shields_util_unittest.cc", ] deps += [ "//brave/app:brave_generated_resources_grit", @@ -445,7 +440,7 @@ test("brave_unit_tests") { "//brave/browser/ui/views/tabs:unit_tests", "//brave/browser/ui/webui/settings:unittests", "//brave/browser/ui/whats_new:unit_test", - "//brave/components/brave_shields/common:mojom", + "//brave/components/brave_shields/core/common:mojom", "//brave/components/brave_wallet/browser:pref_names", "//brave/components/brave_wallet/browser:utils", "//brave/components/brave_wallet/common:test_support", @@ -888,9 +883,10 @@ test("brave_browser_tests") { "//brave/components/brave_rewards/core:publishers_proto", "//brave/components/brave_search/browser", "//brave/components/brave_search/common", - "//brave/components/brave_shields/browser", - "//brave/components/brave_shields/browser:test_support", - "//brave/components/brave_shields/common", + "//brave/components/brave_shields/content/browser", + "//brave/components/brave_shields/content/test:test_support", + "//brave/components/brave_shields/core/browser", + "//brave/components/brave_shields/core/common", "//brave/components/brave_sync:prefs", "//brave/components/brave_vpn/common/buildflags", "//brave/components/brave_wallet/browser", diff --git a/test/base/testing_brave_browser_process.cc b/test/base/testing_brave_browser_process.cc index 1346cfc7ac8..64be6c91391 100644 --- a/test/base/testing_brave_browser_process.cc +++ b/test/base/testing_brave_browser_process.cc @@ -7,7 +7,7 @@ #include -#include "brave/components/brave_shields/browser/ad_block_service.h" +#include "brave/components/brave_shields/content/browser/ad_block_service.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/ipfs/buildflags/buildflags.h" #include "brave/components/tor/buildflags/buildflags.h" diff --git a/third_party/blink/renderer/core/brave_page_graph/page_graph.cc b/third_party/blink/renderer/core/brave_page_graph/page_graph.cc index 917c361d371..67548bacdb7 100644 --- a/third_party/blink/renderer/core/brave_page_graph/page_graph.cc +++ b/third_party/blink/renderer/core/brave_page_graph/page_graph.cc @@ -25,7 +25,7 @@ #include "base/no_destructor.h" #include "base/ranges/algorithm.h" #include "brave/components/brave_page_graph/common/features.h" -#include "brave/components/brave_shields/common/brave_shield_constants.h" +#include "brave/components/brave_shields/core/common/brave_shield_constants.h" #include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_delete.h" #include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_set.h" #include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/binding/edge_binding.h" diff --git a/third_party/blink/renderer/core/brave_page_graph/sources.gni b/third_party/blink/renderer/core/brave_page_graph/sources.gni index e4fa32cc7ab..ef656ad9e74 100644 --- a/third_party/blink/renderer/core/brave_page_graph/sources.gni +++ b/third_party/blink/renderer/core/brave_page_graph/sources.gni @@ -13,7 +13,8 @@ if (enable_brave_page_graph) { brave_page_graph_core_public_deps += [ "//brave/components/brave_page_graph/common" ] - brave_page_graph_core_deps += [ "//brave/components/brave_shields/common" ] + brave_page_graph_core_deps += + [ "//brave/components/brave_shields/core/common" ] brave_page_graph_core_sources += [ "//brave/third_party/blink/renderer/core/brave_page_graph/blink_converters.cc", diff --git a/third_party/blink/renderer/core/farbling/brave_session_cache.cc b/third_party/blink/renderer/core/farbling/brave_session_cache.cc index a3414d8e916..602e7ab7303 100644 --- a/third_party/blink/renderer/core/farbling/brave_session_cache.cc +++ b/third_party/blink/renderer/core/farbling/brave_session_cache.cc @@ -11,7 +11,7 @@ #include "base/feature_list.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" -#include "brave/components/brave_shields/common/features.h" +#include "brave/components/brave_shields/core/common/features.h" #include "brave/third_party/blink/renderer/brave_farbling_constants.h" #include "brave/third_party/blink/renderer/brave_font_whitelist.h" #include "build/build_config.h" diff --git a/third_party/blink/renderer/includes.gni b/third_party/blink/renderer/includes.gni index ca16983dbea..6778a79eb48 100644 --- a/third_party/blink/renderer/includes.gni +++ b/third_party/blink/renderer/includes.gni @@ -34,7 +34,8 @@ brave_blink_renderer_core_sources = [ "//brave/third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.h", ] -brave_blink_renderer_core_deps = [ "//brave/components/brave_shields/common/" ] +brave_blink_renderer_core_deps = + [ "//brave/components/brave_shields/core/common/" ] brave_blink_renderer_core_public_deps += brave_page_graph_core_public_deps brave_blink_renderer_core_sources += brave_page_graph_core_sources