cosmetic filters for Android and desktop

browser/BUILD.gn

@@ -138,6 +138,8 @@ source_set("browser_process") {
     "//brave/components/brave_wayback_machine:buildflags",
     "//brave/components/brave_webtorrent/browser/buildflags",
     "//brave/components/content_settings/core/browser",
+    "//brave/components/cosmetic_filters/browser",
+    "//brave/components/cosmetic_filters/common:mojom",
     "//brave/components/crypto_dot_com/browser/buildflags",
     "//brave/components/gemini/browser/buildflags",
     "//brave/components/greaselion/browser/buildflags",
@@ -182,6 +184,7 @@ source_set("browser_process") {
     "//content/public/browser",
     "//content/public/common",
     "//extensions/buildflags",
+    "//mojo/public/cpp/bindings",
     "//services/metrics/public/cpp:metrics_cpp",
     "//services/network/public/cpp",
     "//third_party/blink/public/mojom:mojom_platform_headers",

browser/android/BUILD.gn

@@ -5,8 +5,6 @@ source_set("android_browser_process") {
   check_includes = false
 
   sources = [
-    "brave_cosmetic_resources_tab_helper.cc",
-    "brave_cosmetic_resources_tab_helper.h",
     "brave_feature_list.cc",
     "brave_relaunch_utils.cc",
     "brave_shields_content_settings.cc",
@@ -29,9 +27,8 @@ source_set("android_browser_process") {
   ]
 
   if (brave_ads_enabled) {
-    sources += [
-      "//brave/browser/brave_ads/android/brave_ads_native_helper.cc",
-    ]
+    sources +=
+        [ "//brave/browser/brave_ads/android/brave_ads_native_helper.cc" ]
 
     deps += [
       "//brave/browser/brave_ads/android:jni_headers",
@@ -42,10 +39,10 @@ source_set("android_browser_process") {
 
   if (enable_brave_sync) {
     sources += [
-      "brave_sync_worker.cc",
-      "brave_sync_worker.h",
       "//brave/browser/sync/brave_sync_devices_android.cc",
       "//brave/browser/sync/brave_sync_devices_android.h",
+      "brave_sync_worker.cc",
+      "brave_sync_worker.h",
     ]
     deps += [
       "//brave/components/brave_sync",

browser/brave_content_browser_client.cc

@@ -20,14 +20,16 @@
 #include "brave/common/pref_names.h"
 #include "brave/common/webui_url_constants.h"
 #include "brave/components/binance/browser/buildflags/buildflags.h"
-#include "brave/components/gemini/browser/buildflags/buildflags.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/components/brave_shields/browser/brave_shields_util.h"
 #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
 #include "brave/components/brave_shields/browser/tracking_protection_service.h"
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
 #include "brave/components/brave_wallet/buildflags/buildflags.h"
 #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h"
+#include "brave/components/cosmetic_filters/browser/cosmetic_filters_resources.h"
+#include "brave/components/cosmetic_filters/common/cosmetic_filters.mojom.h"
+#include "brave/components/gemini/browser/buildflags/buildflags.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/speedreader/buildflags.h"
 #include "brave/components/tor/buildflags/buildflags.h"
@@ -37,6 +39,7 @@
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/url_constants.h"
 #include "components/content_settings/browser/page_specific_content_settings.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/prefs/pref_service.h"
 #include "components/services/heap_profiling/public/mojom/heap_profiling_client.mojom.h"
 #include "content/browser/renderer_host/render_frame_host_impl.h"
@@ -48,6 +51,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "extensions/buildflags/buildflags.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/site_for_cookies.h"
 #include "third_party/blink/public/common/loader/url_loader_throttle.h"
@@ -128,6 +132,24 @@ bool HandleURLRewrite(GURL* url, content::BrowserContext* browser_context) {
   return false;
 }
 
+void BindCosmeticFiltersResources(
+    content::RenderFrameHost* const frame_host,
+    mojo::PendingReceiver<cosmetic_filters::mojom::CosmeticFiltersResources>
+        receiver) {
+  auto* web_contents = content::WebContents::FromRenderFrameHost(frame_host);
+  if (!web_contents)
+    return;
+
+  auto* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  auto* settings_map = HostContentSettingsMapFactory::GetForProfile(profile);
+
+  mojo::MakeSelfOwnedReceiver(
+      std::make_unique<cosmetic_filters::CosmeticFiltersResources>(
+          settings_map, g_brave_browser_process->ad_block_service()),
+      std::move(receiver));
+}
+
 }  // namespace
 
 BraveContentBrowserClient::BraveContentBrowserClient()
@@ -172,6 +194,15 @@ BraveContentBrowserClient::AllowWebBluetooth(
   return ContentBrowserClient::AllowWebBluetoothResult::BLOCK_GLOBALLY_DISABLED;
 }
 
+void BraveContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
+    content::RenderFrameHost* render_frame_host,
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
+  ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
+      render_frame_host, map);
+  map->Add<cosmetic_filters::mojom::CosmeticFiltersResources>(
+      base::BindRepeating(&BindCosmeticFiltersResources));
+}
+
 bool BraveContentBrowserClient::HandleExternalProtocol(
     const GURL& url,
     content::WebContents::OnceGetter web_contents_getter,

browser/brave_content_browser_client.h

@@ -51,6 +51,10 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient {
       const url::Origin& requesting_origin,
       const url::Origin& embedding_origin) override;
 
+  void RegisterBrowserInterfaceBindersForFrame(
+      content::RenderFrameHost* render_frame_host,
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override;
+
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) override;