Merge pull request #10994 from brave/sourceprovider-adblock

Decouple adblock engines from component loading methods

browser/brave_browser_process.h

@@ -32,8 +32,6 @@ class LocalDataFilesService;
 
 namespace brave_shields {
 class AdBlockService;
-class AdBlockCustomFiltersService;
-class AdBlockRegionalServiceManager;
 class HTTPSEverywhereService;
 }  // namespace brave_shields
 
@@ -77,10 +75,6 @@ class BraveBrowserProcess {
   virtual ~BraveBrowserProcess();
   virtual void StartBraveServices() = 0;
   virtual brave_shields::AdBlockService* ad_block_service() = 0;
-  virtual brave_shields::AdBlockCustomFiltersService*
-  ad_block_custom_filters_service() = 0;
-  virtual brave_shields::AdBlockRegionalServiceManager*
-  ad_block_regional_service_manager() = 0;
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   virtual brave_component_updater::ExtensionWhitelistService*
   extension_whitelist_service() = 0;

browser/brave_browser_process_impl.cc

@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "base/task/post_task.h"
+#include "base/task/thread_pool.h"
 #include "brave/browser/brave_shields/ad_block_subscription_download_manager_getter.h"
 #include "brave/browser/brave_stats/brave_stats_updater.h"
 #include "brave/browser/component_updater/brave_component_updater_configurator.h"
@@ -23,7 +24,6 @@
 #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/buildflags/buildflags.h"
-#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
 #include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h"
@@ -192,27 +192,21 @@ void BraveBrowserProcessImpl::StartBraveServices() {
 
 brave_shields::AdBlockService* BraveBrowserProcessImpl::ad_block_service() {
   if (!ad_block_service_) {
+    scoped_refptr<base::SequencedTaskRunner> task_runner(
+        base::ThreadPool::CreateSequencedTaskRunner(
+            {base::MayBlock(), base::TaskPriority::USER_BLOCKING,
+             base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}));
     ad_block_service_ = std::make_unique<brave_shields::AdBlockService>(
-        brave_component_updater_delegate(),
+        local_state(), GetApplicationLocale(), component_updater(), task_runner,
         std::make_unique<brave_shields::AdBlockSubscriptionServiceManager>(
-            brave_component_updater_delegate(),
+            local_state(), task_runner,
             AdBlockSubscriptionDownloadManagerGetter(),
             profile_manager()->user_data_dir().Append(
                 profile_manager()->GetInitialProfileDir())));
   }
   return ad_block_service_.get();
 }
 
-brave_shields::AdBlockCustomFiltersService*
-BraveBrowserProcessImpl::ad_block_custom_filters_service() {
-  return ad_block_service()->custom_filters_service();
-}
-
-brave_shields::AdBlockRegionalServiceManager*
-BraveBrowserProcessImpl::ad_block_regional_service_manager() {
-  return ad_block_service()->regional_service_manager();
-}
-
 NTPBackgroundImagesService*
 BraveBrowserProcessImpl::ntp_background_images_service() {
   if (!ntp_background_images_service_) {
@@ -262,9 +256,11 @@ BraveBrowserProcessImpl::debounce_component_installer() {
 
 brave_shields::HTTPSEverywhereService*
 BraveBrowserProcessImpl::https_everywhere_service() {
-  if (!https_everywhere_service_)
+  if (!created_https_everywhere_service_) {
     https_everywhere_service_ = brave_shields::HTTPSEverywhereServiceFactory(
-        brave_component_updater_delegate());
+        brave_component_updater_delegate()->GetTaskRunner());
+    created_https_everywhere_service_ = true;
+  }
   return https_everywhere_service_.get();
 }
 

browser/brave_browser_process_impl.h

@@ -34,8 +34,6 @@ class LocalDataFilesService;
 
 namespace brave_shields {
 class AdBlockService;
-class AdBlockCustomFiltersService;
-class AdBlockRegionalServiceManager;
 class HTTPSEverywhereService;
 }  // namespace brave_shields
 
@@ -90,10 +88,6 @@ class BraveBrowserProcessImpl : public BraveBrowserProcess,
 
   void StartBraveServices() override;
   brave_shields::AdBlockService* ad_block_service() override;
-  brave_shields::AdBlockCustomFiltersService* ad_block_custom_filters_service()
-      override;
-  brave_shields::AdBlockRegionalServiceManager*
-  ad_block_regional_service_manager() override;
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   brave_component_updater::ExtensionWhitelistService*
   extension_whitelist_service() override;
@@ -155,6 +149,7 @@ class BraveBrowserProcessImpl : public BraveBrowserProcess,
 #endif
   std::unique_ptr<debounce::DebounceComponentInstaller>
       debounce_component_installer_;
+  bool created_https_everywhere_service_ = false;
   std::unique_ptr<brave_shields::HTTPSEverywhereService>
       https_everywhere_service_;
   std::unique_ptr<brave_stats::BraveStatsUpdater> brave_stats_updater_;

browser/brave_content_browser_client.cc

@@ -876,7 +876,8 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
           content::NavigationThrottle> domain_block_navigation_throttle =
           brave_shields::DomainBlockNavigationThrottle::MaybeCreateThrottleFor(
               handle, g_brave_browser_process->ad_block_service(),
-              g_brave_browser_process->ad_block_custom_filters_service(),
+              g_brave_browser_process->ad_block_service()
+                  ->custom_filters_provider(),
               EphemeralStorageServiceFactory::GetForContext(context),
               HostContentSettingsMapFactory::GetForProfile(
                   Profile::FromBrowserContext(context)),