Cleanup brave_shields component

.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",

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",

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"

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",

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 <string>
 

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/content/browser",
-    "//brave/components/brave_shields/common",
+    "//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",

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"

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/content/browser/brave_shields_util.h"
-#include "brave/components/brave_shields/common/pref_names.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"

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"

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/content/browser/ad_block_service.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/components/brave_shields/browser/brave_farbling_service.h"
+#include "brave/components/brave_shields/content/browser/brave_farbling_service.h"
-#include "brave/components/brave_shields/common/features.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"

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/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/brave_farbling_service.h"
+#include "brave/components/brave_shields/content/browser/brave_farbling_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/brave_shields/browser/domain_block_navigation_throttle.h"
+#include "brave/components/brave_shields/content/browser/domain_block_navigation_throttle.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_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/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/core/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/cookie_list_opt_in.mojom.h"
 #include "brave/components/commands/common/commands.mojom.h"
 #include "brave/components/commands/common/features.h"
 #endif

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"

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/content/browser/ad_block_service.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/brave_vpn/common/buildflags/buildflags.h"
 #include "brave/components/brave_wallet/browser/brave_wallet_prefs.h"
 #include "brave/components/constants/pref_names.h"

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/core/common/features.h"
-#include "brave/components/brave_shields/common/pref_names.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"

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/content/browser/brave_farbling_service.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/brave_shields/common/pref_names.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"

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"

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/content/browser/ad_block_custom_filters_provider.h"
-#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h"
+#include "brave/components/brave_shields/content/browser/ad_block_engine.h"
-#include "brave/components/brave_shields/browser/ad_block_engine.h"
+#include "brave/components/brave_shields/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.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_observer.h"
-#include "brave/components/brave_shields/browser/ad_block_subscription_service_manager_observer.h"
+#include "brave/components/brave_shields/content/browser/brave_shields_util.h"
-#include "brave/components/brave_shields/browser/brave_shields_util.h"
+#include "brave/components/brave_shields/content/test/engine_test_observer.h"
-#include "brave/components/brave_shields/browser/engine_test_observer.h"
+#include "brave/components/brave_shields/content/test/test_filters_provider.h"
-#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h"
+#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h"
-#include "brave/components/brave_shields/browser/test_filters_provider.h"
+#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.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_shields/common/features.h"
+#include "brave/components/brave_shields/core/common/features.h"
-#include "brave/components/brave_shields/common/pref_names.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"

browser/brave_shields/ad_block_service_browsertest.h

@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#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"

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();

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/content/browser/brave_shields_util.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_shields/common/pref_names.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"

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"

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"

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"

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"

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/content/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_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/brave_shields/common/features.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"

browser/brave_shields/eventsource_pool_limit_browsertest.cc

@@ -7,7 +7,7 @@
 #include <string_view>
 
 #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"

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"

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"

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"

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/content/browser",
-  "//brave/components/brave_shields/common",
+  "//brave/components/brave_shields/core/common",
   "//brave/components/constants",
   "//chrome/browser/profiles:profile",
   "//chrome/common",

browser/brave_shields/websockets_pool_limit_browsertest.cc

@@ -6,7 +6,7 @@
 #include <string_view>
 
 #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"

browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc

@@ -10,8 +10,8 @@
 #include <utility>
 
 #include "base/functional/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/brave_shields/common/brave_shield_constants.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"

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/content/browser/ad_block_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/brave_shields/browser/engine_test_observer.h"
+#include "brave/components/brave_shields/content/test/engine_test_observer.h"
-#include "brave/components/brave_shields/browser/test_filters_provider.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"

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/content/browser",
-      "//brave/components/brave_shields/browser:test_support",
+      "//brave/components/brave_shields/content/test:test_support",
-      "//brave/components/brave_shields/common",
+      "//brave/components/brave_shields/core/common",
       "//brave/components/ephemeral_storage",
       "//chrome/browser",
       "//chrome/browser/ui",

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"

browser/ephemeral_storage/brave_ephemeral_storage_service_delegate.cc

@@ -7,7 +7,7 @@
 
 #include <utility>
 
-#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"

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"

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/content/browser/ad_block_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/brave_shields/browser/engine_test_observer.h"
+#include "brave/components/brave_shields/content/test/engine_test_observer.h"
-#include "brave/components/brave_shields/browser/test_filters_provider.h"
+#include "brave/components/brave_shields/content/test/test_filters_provider.h"
-#include "brave/components/brave_shields/common/features.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"

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/content/browser/brave_shields_util.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 "brave/components/ephemeral_storage/ephemeral_storage_service.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"

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"

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"

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"

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/content/browser",
-    "//brave/components/brave_shields/common",
+    "//brave/components/brave_shields/core/common",
     "//brave/components/brave_vpn/common/buildflags",
     "//brave/components/brave_wallet/browser:utils",
     "//brave/components/brave_wallet/common",

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/content/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_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/ui/browser_finder.h"

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/content/browser/brave_shields_util.h"
-#include "brave/components/brave_shields/common/pref_names.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"

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/content/browser",
-      "//brave/components/brave_shields/common:common",
+      "//brave/components/brave_shields/core/common",
       "//brave/components/constants",
       "//chrome/browser",
       "//chrome/browser/ui",

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/content/browser/brave_shields_util.h"
-#include "brave/components/brave_shields/common/features.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"

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"

browser/farbling/brave_font_whitelist_browsertest.cc

@@ -6,7 +6,7 @@
 #include <string_view>
 
 #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"

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"

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"

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"

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/content/browser/brave_farbling_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/brave_shields/common/features.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"

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"

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"

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/content/browser/brave_shields_util.h"
-#include "brave/components/brave_shields/common/features.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"

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"

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"

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"

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"

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"

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/content/browser",
-    "//brave/components/brave_shields/common",
+    "//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/content/browser",
-    "//brave/components/brave_shields/common",
+    "//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/content/browser",
-    "//brave/components/brave_shields/browser:test_support",
+    "//brave/components/brave_shields/content/test:test_support",
     "//brave/components/l10n/common:test_support",
     "//chrome/test:test_support",
     "//content/test:test_support",

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/content/browser/ad_block_service.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 "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"

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/content/browser/ad_block_pref_service.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/common/brave_shield_constants.h"
+#include "brave/components/brave_shields/core/common/brave_shield_constants.h"
-#include "brave/components/brave_shields/common/features.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"

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/content/browser/ad_block_service.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 "brave/components/brave_shields/browser/test_filters_provider.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"

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/content/browser/brave_shields_util.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 "brave/components/constants/pref_names.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"

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"

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/content/browser/adblock_stub_response.h"
-#include "brave/components/brave_shields/common/features.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"

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/content/browser/brave_farbling_service.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 "components/content_settings/core/browser/host_content_settings_map.h"

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"

browser/net/brave_site_hacks_network_delegate_helper.cc

@@ -10,7 +10,7 @@
 #include <vector>
 
 #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"

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"

browser/net/url_context.cc

@@ -9,7 +9,7 @@
 #include <string>
 
 #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"

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/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h"
-#include "brave/components/brave_shields/common/brave_shield_constants.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"

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/content/browser",
-  "//brave/components/brave_shields/common/",
+  "//brave/components/brave_shields/core/browser",
+  "//brave/components/brave_shields/core/common/",
   "//components/prefs",
 ]
 

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/content/browser",
-      "//brave/components/brave_shields/browser:test_support",
+      "//brave/components/brave_shields/content/test:test_support",
-      "//brave/components/brave_shields/common",
+      "//brave/components/brave_shields/core/common",
       "//brave/components/brave_wallet/browser",
       "//brave/components/brave_wallet/browser:permission_utils",
       "//brave/components/brave_wallet/common",

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/content/browser/brave_shields_util.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 "brave/components/constants/pref_names.h"
 #include "brave/components/google_sign_in_permission/features.h"

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/content/browser/ad_block_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/brave_shields/browser/test_filters_provider.h"
+#include "brave/components/brave_shields/content/test/test_filters_provider.h"
-#include "brave/components/brave_shields/common/features.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"

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/content/browser/brave_shields_p3a.h"
-#include "brave/components/brave_shields/common/brave_shield_utils.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"

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",

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/content/browser",
-    "//brave/components/brave_shields/common:common",
+    "//brave/components/brave_shields/core/common",
     "//brave/components/request_otr/browser",
     "//brave/components/request_otr/common",
     "//chrome/browser",

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/content/browser/brave_shields_util.h"
-#include "brave/components/brave_shields/common/features.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"

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/core/common",
-  "//brave/components/brave_shields/common:mojom",
+  "//brave/components/brave_shields/core/common:mojom",
   "//brave/components/brave_sync",
   "//brave/components/brave_sync:features",
   "//brave/components/brave_sync:network_time_helper",

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"

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",

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"

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/content/browser",
-    "//brave/components/brave_shields/common",
+    "//brave/components/brave_shields/core/common",
-    "//brave/components/brave_shields/common:mojom",
+    "//brave/components/brave_shields/core/common:mojom",
     "//brave/components/brave_sync:crypto",
     "//brave/components/brave_sync:prefs",
     "//brave/components/brave_sync:time_limited_codes",

browser/ui/brave_shields_data_controller.cc

@@ -10,8 +10,8 @@
 #include <utility>
 
 #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_shields/common/brave_shield_constants.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"

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"

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/content/browser/brave_shields_util.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_shields/common/brave_shields_panel.mojom.h"
+#include "brave/components/brave_shields/core/common/brave_shields_panel.mojom.h"
-#include "brave/components/brave_shields/common/features.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"

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/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h"
-#include "brave/components/brave_shields/browser/filter_list_catalog_entry.h"
+#include "brave/components/brave_shields/core/browser/filter_list_catalog_entry.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_shields/common/features.h"
+#include "brave/components/brave_shields/core/common/features.h"
-#include "brave/components/brave_shields/common/pref_names.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"

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/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.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_shields/common/features.h"
+#include "brave/components/brave_shields/core/common/features.h"
-#include "brave/components/brave_shields/common/pref_names.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"

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"

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/content/browser/ad_block_custom_filters_provider.h"
-#include "brave/components/brave_shields/browser/ad_block_custom_filters_provider.h"
+#include "brave/components/brave_shields/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h"
-#include "brave/components/brave_shields/browser/ad_block_service_helper.h"
+#include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager_observer.h"
-#include "brave/components/brave_shields/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/browser/ad_block_subscription_service_manager_observer.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"

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/content/browser/ad_block_service.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/core/browser/ad_block_component_service_manager.h"
-#include "brave/components/brave_shields/common/brave_shield_constants.h"
+#include "brave/components/brave_shields/core/common/brave_shield_constants.h"
 
 CookieListOptInPageHandler::CookieListOptInPageHandler(
     mojo::PendingReceiver<brave_shields::mojom::CookieListOptInPageHandler>

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"

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"

browser/ui/webui/brave_shields/cookie_list_opt_in_ui.h

@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#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"

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"

browser/ui/webui/brave_shields/shields_panel_handler.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #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"