From b43127646f3b052935501cf545ccb260fbe7561e Mon Sep 17 00:00:00 2001
From: Emerick Rogul <erogul@brave.com>
Date: Tue, 5 Mar 2019 19:36:32 -0500
Subject: [PATCH 1/6] Add CustomFilters component to Adblock page

---
 browser/ui/webui/brave_webui_source.cc        |  2 +
 components/brave_adblock_ui/BUILD.gn          |  1 +
 .../actions/adblock_actions.ts                | 12 +++++
 components/brave_adblock_ui/brave_adblock.tsx | 12 +++++
 .../brave_adblock_ui/components/app.tsx       |  7 ++-
 .../components/customFilters.tsx              | 44 +++++++++++++++++++
 .../constants/adblock_types.ts                |  5 ++-
 .../reducers/adblock_reducer.ts               | 15 +++++++
 components/brave_adblock_ui/storage.ts        |  3 ++
 components/definitions/adBlock.d.ts           |  3 ++
 .../resources/brave_components_strings.grd    |  2 +
 11 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 components/brave_adblock_ui/components/customFilters.tsx

diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
index 37a9d4f14306..590f51fad4a1 100644
--- a/browser/ui/webui/brave_webui_source.cc
+++ b/browser/ui/webui/brave_webui_source.cc
@@ -527,6 +527,8 @@ void CustomizeWebUIHTMLSource(const std::string &name,
     }, {
       std::string("adblock"), {
         { "adsBlocked", IDS_ADBLOCK_TOTAL_ADS_BLOCKED },
+        { "customFiltersTitle", IDS_ADBLOCK_CUSTOM_FILTERS_TITLE },
+        { "customFiltersInstructions", IDS_ADBLOCK_CUSTOM_FILTERS_INSTRUCTIONS },                // NOLINT
         { "regionalAdblockEnabledTitle", IDS_ADBLOCK_REGIONAL_AD_BLOCK_ENABLED_TITLE},           // NOLINT
         { "regionalAdblockEnabled", IDS_ADBLOCK_REGIONAL_AD_BLOCK_ENABLED },
         { "regionalAdblockDisabled", IDS_ADBLOCK_REGIONAL_AD_BLOCK_DISABLED },
diff --git a/components/brave_adblock_ui/BUILD.gn b/components/brave_adblock_ui/BUILD.gn
index a9eba036bd46..af1194041b1b 100644
--- a/components/brave_adblock_ui/BUILD.gn
+++ b/components/brave_adblock_ui/BUILD.gn
@@ -8,6 +8,7 @@ transpile_web_ui("brave_adblock_ui") {
     "store.ts",
     "actions/adblock_actions.ts",
     "components/app.tsx",
+    "components/customFilters.tsx",
     "components/numBlockedStat.tsx",
     "components/regionalAdBlockEnabled.tsx",
     "constants/adblock_types.ts",
diff --git a/components/brave_adblock_ui/actions/adblock_actions.ts b/components/brave_adblock_ui/actions/adblock_actions.ts
index ca4b394bc6a1..d14e5be51ee5 100644
--- a/components/brave_adblock_ui/actions/adblock_actions.ts
+++ b/components/brave_adblock_ui/actions/adblock_actions.ts
@@ -7,4 +7,16 @@ import { action } from 'typesafe-actions'
 // Constants
 import { types } from '../constants/adblock_types'
 
+export const getCustomFilters = () => action(types.ADBLOCK_GET_CUSTOM_FILTERS)
+
+export const onGetCustomFilters = (customFilters: string) =>
+  action(types.ADBLOCK_ON_GET_CUSTOM_FILTERS, {
+    customFilters
+  })
+
 export const statsUpdated = () => action(types.ADBLOCK_STATS_UPDATED)
+
+export const updateCustomFilters = (customFilters: string) =>
+  action(types.ADBLOCK_UPDATE_CUSTOM_FILTERS, {
+    customFilters
+  })
diff --git a/components/brave_adblock_ui/brave_adblock.tsx b/components/brave_adblock_ui/brave_adblock.tsx
index 734cd944b73c..285a83d85916 100644
--- a/components/brave_adblock_ui/brave_adblock.tsx
+++ b/components/brave_adblock_ui/brave_adblock.tsx
@@ -17,7 +17,13 @@ import * as adblockActions from './actions/adblock_actions'
 window.cr.define('brave_adblock', function () {
   'use strict'
 
+  function getCustomFilters () {
+    const actions = bindActionCreators(adblockActions, store.dispatch.bind(store))
+    actions.getCustomFilters()
+  }
+
   function initialize () {
+    getCustomFilters()
     render(
       <Provider store={store}>
         <App />
@@ -26,6 +32,11 @@ window.cr.define('brave_adblock', function () {
     window.i18nTemplate.process(window.document, window.loadTimeData)
   }
 
+  function onGetCustomFilters (customFilters: string) {
+    const actions = bindActionCreators(adblockActions, store.dispatch.bind(store))
+    actions.onGetCustomFilters(customFilters)
+  }
+
   function statsUpdated () {
     const actions = bindActionCreators(adblockActions, store.dispatch.bind(store))
     actions.statsUpdated()
@@ -33,6 +44,7 @@ window.cr.define('brave_adblock', function () {
 
   return {
     initialize,
+    onGetCustomFilters,
     statsUpdated
   }
 })
diff --git a/components/brave_adblock_ui/components/app.tsx b/components/brave_adblock_ui/components/app.tsx
index e9652db8cd3c..6b06bda62037 100644
--- a/components/brave_adblock_ui/components/app.tsx
+++ b/components/brave_adblock_ui/components/app.tsx
@@ -7,6 +7,7 @@ import { bindActionCreators, Dispatch } from 'redux'
 import { connect } from 'react-redux'
 
 // Components
+import { CustomFilters } from './customFilters'
 import { RegionalAdBlockEnabled } from './regionalAdBlockEnabled'
 import { NumBlockedStat } from './numBlockedStat'
 
@@ -24,7 +25,7 @@ export class AdblockPage extends React.Component<Props, {}> {
   }
 
   render () {
-    const { adblockData } = this.props
+    const { actions, adblockData } = this.props
     return (
       <div id='adblockPage'>
         <NumBlockedStat adsBlockedStat={adblockData.stats.adsBlockedStat || 0} />
@@ -32,6 +33,10 @@ export class AdblockPage extends React.Component<Props, {}> {
           regionalAdBlockEnabled={adblockData.stats.regionalAdBlockEnabled}
           regionalAdBlockTitle={adblockData.stats.regionalAdBlockTitle || ''}
         />
+        <CustomFilters
+          actions={actions}
+          rules={adblockData.settings.customFilters || ''}
+        />
       </div>)
   }
 }
diff --git a/components/brave_adblock_ui/components/customFilters.tsx b/components/brave_adblock_ui/components/customFilters.tsx
new file mode 100644
index 000000000000..424d6efc7d25
--- /dev/null
+++ b/components/brave_adblock_ui/components/customFilters.tsx
@@ -0,0 +1,44 @@
+/* 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/. */
+
+import * as React from 'react'
+
+interface Props {
+  actions: any,
+  rules: string
+}
+
+export class CustomFilters extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props)
+  }
+
+  onChangeCustomFilters = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+    this.props.actions.updateCustomFilters(event.target.value)
+  }
+
+  render() {
+    return (
+      <div>
+        <div
+          i18n-content='customFiltersTitle'
+          style={{ fontSize: '18px', marginTop: '20px' }}
+        />
+        <div
+          i18n-content='customFiltersInstructions'
+          style={{ fontWeight: 'bold' }}
+        />
+        <textarea
+          style={{ marginTop: '10px' }}
+          data-test-id={'customFiltersInput'}
+          cols={100}
+          rows={10}
+          spellCheck={false}
+          value={this.props.rules}
+          onChange={this.onChangeCustomFilters}
+        />
+      </div>
+    )
+  }
+}
diff --git a/components/brave_adblock_ui/constants/adblock_types.ts b/components/brave_adblock_ui/constants/adblock_types.ts
index 5f035ec1a3a8..4e39f27adc38 100644
--- a/components/brave_adblock_ui/constants/adblock_types.ts
+++ b/components/brave_adblock_ui/constants/adblock_types.ts
@@ -3,5 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 export const enum types {
-  ADBLOCK_STATS_UPDATED = '@@adblock/ADBLOCK_STATS_UPDATED'
+  ADBLOCK_GET_CUSTOM_FILTERS = '@@adblock/ADBLOCK_GET_CUSTOM_FILTERS',
+  ADBLOCK_ON_GET_CUSTOM_FILTERS = '@@adblock/ADBLOCK_ON_GET_CUSTOM_FILTERS',
+  ADBLOCK_STATS_UPDATED = '@@adblock/ADBLOCK_STATS_UPDATED',
+  ADBLOCK_UPDATE_CUSTOM_FILTERS = '@@adblock/ADBLOCK_UPDATE_CUSTOM_FILTERS'
 }
diff --git a/components/brave_adblock_ui/reducers/adblock_reducer.ts b/components/brave_adblock_ui/reducers/adblock_reducer.ts
index 4670199493e2..6e69d05cc2e3 100644
--- a/components/brave_adblock_ui/reducers/adblock_reducer.ts
+++ b/components/brave_adblock_ui/reducers/adblock_reducer.ts
@@ -9,6 +9,11 @@ import { types } from '../constants/adblock_types'
 
 // Utils
 import * as storage from '../storage'
+import { debounce } from '../../common/debounce'
+
+const updateCustomFilters = debounce((customFilters: string) => {
+  chrome.send('brave_adblock.updateCustomFilters', [customFilters])
+}, 1500)
 
 const adblockReducer: Reducer<AdBlock.State | undefined> = (state: AdBlock.State | undefined, action) => {
   if (state === undefined) {
@@ -17,9 +22,19 @@ const adblockReducer: Reducer<AdBlock.State | undefined> = (state: AdBlock.State
 
   const startingState = state
   switch (action.type) {
+    case types.ADBLOCK_GET_CUSTOM_FILTERS:
+      chrome.send('brave_adblock.getCustomFilters')
+      break
+    case types.ADBLOCK_ON_GET_CUSTOM_FILTERS:
+      state = { ...state, settings: { customFilters: action.payload.customFilters } }
+      break
     case types.ADBLOCK_STATS_UPDATED:
       state = storage.getLoadTimeData(state)
       break
+    case types.ADBLOCK_UPDATE_CUSTOM_FILTERS:
+      state = { ...state, settings: { customFilters: action.payload.customFilters } }
+      updateCustomFilters(state.settings.customFilters)
+      break
     default:
       break
   }
diff --git a/components/brave_adblock_ui/storage.ts b/components/brave_adblock_ui/storage.ts
index 309895f08d0a..32ce50506841 100644
--- a/components/brave_adblock_ui/storage.ts
+++ b/components/brave_adblock_ui/storage.ts
@@ -7,6 +7,9 @@ import { debounce } from '../common/debounce'
 const keyName = 'adblock-data'
 
 export const defaultState: AdBlock.State = {
+  settings: {
+    customFilters: ''
+  },
   stats: {
     numBlocked: 0,
     regionalAdBlockEnabled: false
diff --git a/components/definitions/adBlock.d.ts b/components/definitions/adBlock.d.ts
index df81457190f6..8b79779a9fe5 100644
--- a/components/definitions/adBlock.d.ts
+++ b/components/definitions/adBlock.d.ts
@@ -4,6 +4,9 @@ declare namespace AdBlock {
   }
 
   export interface State {
+    settings: {
+      customFilters: string
+    },
     stats: {
       adsBlockedStat?: number
       numBlocked: number
diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
index c810d1b14de7..9cf5f89b2a93 100644
--- a/components/resources/brave_components_strings.grd
+++ b/components/resources/brave_components_strings.grd
@@ -164,6 +164,8 @@
 
       <!-- WebUI adblock resources -->
       <message name="IDS_ADBLOCK_TOTAL_ADS_BLOCKED" desc="total number of ads blocked">Total Ads Blocked:</message>
+      <message name="IDS_ADBLOCK_CUSTOM_FILTERS_TITLE" desc="Title for custom filters section">Custom Filters</message>
+      <message name="IDS_ADBLOCK_CUSTOM_FILTERS_INSTRUCTIONS" desc="Instructions for custom filters section">One per line, a filter is described in Adblock Plus filter syntax</message>
       <message name="IDS_ADBLOCK_REGIONAL_AD_BLOCK_ENABLED_TITLE" desc="Title for if geographic regional ad-blocking is enabled">Regional Ad Block:</message>
       <message name="IDS_ADBLOCK_REGIONAL_AD_BLOCK_ENABLED" desc="Geographic regional ad-blocking is enabled">Enabled</message>
       <message name="IDS_ADBLOCK_REGIONAL_AD_BLOCK_DISABLED" desc="Geographic regional ad-blocking is disabled">Disabled</message>

From 68c7cb9787224e8edbe2b9b3eacc1ddbf6dad48f Mon Sep 17 00:00:00 2001
From: Emerick Rogul <erogul@brave.com>
Date: Tue, 12 Mar 2019 10:32:18 -0400
Subject: [PATCH 2/6] Add DOM handler for retrieving and updating Adblock
 settings

---
 browser/ui/webui/brave_adblock_ui.cc | 76 +++++++++++++++++++++++++---
 browser/ui/webui/brave_adblock_ui.h  |  5 +-
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/browser/ui/webui/brave_adblock_ui.cc b/browser/ui/webui/brave_adblock_ui.cc
index d74c33d309fe..95ce2a4f949c 100644
--- a/browser/ui/webui/brave_adblock_ui.cc
+++ b/browser/ui/webui/brave_adblock_ui.cc
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
@@ -8,6 +9,7 @@
 #include "brave/common/pref_names.h"
 #include "brave/common/webui_url_constants.h"
 #include "brave/components/brave_adblock/resources/grit/brave_adblock_generated_map.h"
+#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/grit/brave_components_resources.h"
@@ -18,6 +20,61 @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
+namespace {
+
+class AdblockDOMHandler : public content::WebUIMessageHandler {
+ public:
+  AdblockDOMHandler();
+  ~AdblockDOMHandler() override;
+
+  // WebUIMessageHandler implementation.
+  void RegisterMessages() override;
+
+ private:
+  void HandleGetCustomFilters(const base::ListValue* args);
+  void HandleUpdateCustomFilters(const base::ListValue* args);
+
+  DISALLOW_COPY_AND_ASSIGN(AdblockDOMHandler);
+};
+
+AdblockDOMHandler::AdblockDOMHandler() {}
+
+AdblockDOMHandler::~AdblockDOMHandler() {}
+
+void AdblockDOMHandler::RegisterMessages() {
+  web_ui()->RegisterMessageCallback(
+      "brave_adblock.getCustomFilters",
+      base::BindRepeating(&AdblockDOMHandler::HandleGetCustomFilters,
+                          base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "brave_adblock.updateCustomFilters",
+      base::BindRepeating(&AdblockDOMHandler::HandleUpdateCustomFilters,
+                          base::Unretained(this)));
+}
+
+void AdblockDOMHandler::HandleGetCustomFilters(const base::ListValue* args) {
+  DCHECK_EQ(args->GetSize(), 0U);
+  const std::string custom_filters =
+      g_brave_browser_process->ad_block_custom_filters_service()
+          ->GetCustomFilters();
+  if (!web_ui()->CanCallJavascript())
+    return;
+  web_ui()->CallJavascriptFunctionUnsafe("brave_adblock.onGetCustomFilters",
+                                         base::Value(custom_filters));
+}
+
+void AdblockDOMHandler::HandleUpdateCustomFilters(const base::ListValue* args) {
+  DCHECK_EQ(args->GetSize(), 1U);
+  std::string custom_filters;
+  if (!args->GetString(0, &custom_filters))
+    return;
+
+  g_brave_browser_process->ad_block_custom_filters_service()
+      ->UpdateCustomFilters(custom_filters);
+}
+
+}  // namespace
+
 BraveAdblockUI::BraveAdblockUI(content::WebUI* web_ui, const std::string& name)
     : BasicUI(web_ui, name, kBraveAdblockGenerated,
         kBraveAdblockGeneratedSize, IDR_BRAVE_ADBLOCK_HTML) {
@@ -27,22 +84,27 @@ BraveAdblockUI::BraveAdblockUI(content::WebUI* web_ui, const std::string& name)
   pref_change_registrar_->Init(prefs);
   pref_change_registrar_->Add(kAdsBlocked,
     base::Bind(&BraveAdblockUI::OnPreferenceChanged, base::Unretained(this)));
+  web_ui->AddMessageHandler(std::make_unique<AdblockDOMHandler>());
 }
 
 BraveAdblockUI::~BraveAdblockUI() {
 }
 
-void BraveAdblockUI::CustomizeWebUIProperties(content::RenderViewHost* render_view_host) {
+void BraveAdblockUI::CustomizeWebUIProperties(
+    content::RenderViewHost* render_view_host) {
   DCHECK(IsSafeToSetWebUIProperties());
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
   if (render_view_host) {
-    render_view_host->SetWebUIProperty("adsBlockedStat", std::to_string(prefs->GetUint64(kAdsBlocked)));
-    render_view_host->SetWebUIProperty("regionalAdBlockEnabled",
-        std::to_string(
-          g_brave_browser_process->ad_block_regional_service()->IsInitialized()));
-    render_view_host->SetWebUIProperty("regionalAdBlockTitle",
+    render_view_host->SetWebUIProperty(
+        "adsBlockedStat", std::to_string(prefs->GetUint64(kAdsBlocked)));
+    render_view_host->SetWebUIProperty(
+        "regionalAdBlockEnabled",
+        std::to_string(g_brave_browser_process->ad_block_regional_service()
+                           ->IsInitialized()));
+    render_view_host->SetWebUIProperty(
+        "regionalAdBlockTitle",
         g_brave_browser_process->ad_block_regional_service()->GetTitle());
   }
 }
diff --git a/browser/ui/webui/brave_adblock_ui.h b/browser/ui/webui/brave_adblock_ui.h
index a861e4b140fe..8e3749197054 100644
--- a/browser/ui/webui/brave_adblock_ui.h
+++ b/browser/ui/webui/brave_adblock_ui.h
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
@@ -6,6 +7,8 @@
 #define BRAVE_BROWSER_UI_WEBUI_BRAVE_ADBLOCK_UI_H_
 
 #include <memory>
+#include <string>
+
 #include "brave/browser/ui/webui/basic_ui.h"
 
 class PrefChangeRegistrar;

From 83fe170e336ba78d905b13509d4b3676b84f6279 Mon Sep 17 00:00:00 2001
From: Emerick Rogul <erogul@brave.com>
Date: Wed, 13 Mar 2019 15:00:22 -0400
Subject: [PATCH 3/6] Add Adblock custom filters service

---
 browser/brave_browser_process_impl.cc         | 21 +++++--
 browser/brave_browser_process_impl.h          | 12 +++-
 browser/brave_local_state_prefs.cc            |  5 +-
 ...ave_ad_block_tp_network_delegate_helper.cc | 22 +++++---
 common/pref_names.cc                          |  1 +
 common/pref_names.h                           |  1 +
 components/brave_shields/browser/BUILD.gn     |  2 +
 .../ad_block_custom_filters_service.cc        | 56 +++++++++++++++++++
 .../browser/ad_block_custom_filters_service.h | 43 ++++++++++++++
 .../brave_shields/browser/ad_block_service.cc |  9 ++-
 .../brave_shields/browser/ad_block_service.h  |  3 +
 ...brave_resource_dispatcher_host_delegate.cc |  7 ++-
 12 files changed, 163 insertions(+), 19 deletions(-)
 create mode 100644 components/brave_shields/browser/ad_block_custom_filters_service.cc
 create mode 100644 components/brave_shields/browser/ad_block_custom_filters_service.h

diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc
index ed7e8d80816f..5a4ffc3a0ada 100644
--- a/browser/brave_browser_process_impl.cc
+++ b/browser/brave_browser_process_impl.cc
@@ -1,20 +1,24 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
 #include "brave/browser/brave_browser_process_impl.h"
 
+#include <utility>
+
 #include "base/bind.h"
-#include "base/task/post_task.h"
 #include "base/path_service.h"
+#include "base/task/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "brave/browser/brave_stats_updater.h"
 #include "brave/browser/component_updater/brave_component_updater_configurator.h"
 #include "brave/browser/extensions/brave_tor_client_updater.h"
 #include "brave/browser/profiles/brave_profile_manager.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_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service.h"
+#include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/autoplay_whitelist_service.h"
 #include "brave/components/brave_shields/browser/extension_whitelist_service.h"
 #include "brave/components/brave_shields/browser/https_everywhere_service.h"
@@ -37,7 +41,8 @@ using content::BrowserThread;
 BraveBrowserProcessImpl::~BraveBrowserProcessImpl() {
 }
 
-BraveBrowserProcessImpl::BraveBrowserProcessImpl(ChromeFeatureListCreator* chrome_feature_list_creator)
+BraveBrowserProcessImpl::BraveBrowserProcessImpl(
+    ChromeFeatureListCreator* chrome_feature_list_creator)
     : BrowserProcessImpl(chrome_feature_list_creator) {
   g_browser_process = this;
   g_brave_browser_process = this;
@@ -106,6 +111,14 @@ BraveBrowserProcessImpl::ad_block_service() {
   return ad_block_service_.get();
 }
 
+brave_shields::AdBlockCustomFiltersService*
+BraveBrowserProcessImpl::ad_block_custom_filters_service() {
+  if (!ad_block_custom_filters_service_)
+    ad_block_custom_filters_service_ =
+        brave_shields::AdBlockCustomFiltersServiceFactory();
+  return ad_block_custom_filters_service_.get();
+}
+
 brave_shields::AdBlockRegionalService*
 BraveBrowserProcessImpl::ad_block_regional_service() {
   if (!ad_block_regional_service_)
diff --git a/browser/brave_browser_process_impl.h b/browser/brave_browser_process_impl.h
index 847bf6b950f1..4d56f924b6c7 100644
--- a/browser/brave_browser_process_impl.h
+++ b/browser/brave_browser_process_impl.h
@@ -1,10 +1,13 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* 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_BROWSER_BRAVE_BROWSER_PROCESS_IMPL_H_
 #define BRAVE_BROWSER_BRAVE_BROWSER_PROCESS_IMPL_H_
 
+#include <memory>
+
 #include "chrome/browser/browser_process_impl.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
@@ -19,6 +22,7 @@ class BraveWidevineBundleManager;
 
 namespace brave_shields {
 class AdBlockService;
+class AdBlockCustomFiltersService;
 class AdBlockRegionalService;
 class AutoplayWhitelistService;
 class ExtensionWhitelistService;
@@ -33,7 +37,8 @@ class BraveTorClientUpdater;
 
 class BraveBrowserProcessImpl : public BrowserProcessImpl {
  public:
-  BraveBrowserProcessImpl(ChromeFeatureListCreator* chrome_feature_list_creator);
+  BraveBrowserProcessImpl(
+      ChromeFeatureListCreator* chrome_feature_list_creator);
   ~BraveBrowserProcessImpl() override;
 
   // BrowserProcess implementation.
@@ -42,6 +47,7 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
   ProfileManager* profile_manager() override;
 
   brave_shields::AdBlockService* ad_block_service();
+  brave_shields::AdBlockCustomFiltersService* ad_block_custom_filters_service();
   brave_shields::AdBlockRegionalService* ad_block_regional_service();
   brave_shields::AutoplayWhitelistService* autoplay_whitelist_service();
   brave_shields::ExtensionWhitelistService* extension_whitelist_service();
@@ -57,6 +63,8 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
   void CreateProfileManager();
 
   std::unique_ptr<brave_shields::AdBlockService> ad_block_service_;
+  std::unique_ptr<brave_shields::AdBlockCustomFiltersService>
+      ad_block_custom_filters_service_;
   std::unique_ptr<brave_shields::AdBlockRegionalService>
       ad_block_regional_service_;
   std::unique_ptr<brave_shields::AutoplayWhitelistService>
diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
index 64a0c24571e2..a2e97181cc3b 100644
--- a/browser/brave_local_state_prefs.cc
+++ b/browser/brave_local_state_prefs.cc
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
@@ -8,6 +9,7 @@
 #include "brave/browser/brave_stats_updater.h"
 #include "brave/browser/tor/tor_profile_service.h"
 #include "brave/components/brave_referrals/browser/brave_referrals_service.h"
+#include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -15,6 +17,7 @@
 namespace brave {
 
 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
+  brave_shields::RegisterPrefsForAdBlockService(registry);
   RegisterPrefsForBraveStatsUpdater(registry);
   RegisterPrefsForBraveReferralsService(registry);
 #if defined(OS_MACOSX)
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 aae1540279ac..d59cefa43f38 100644
--- a/browser/net/brave_ad_block_tp_network_delegate_helper.cc
+++ b/browser/net/brave_ad_block_tp_network_delegate_helper.cc
@@ -13,6 +13,7 @@
 #include "brave/browser/brave_browser_process_impl.h"
 #include "brave/common/network_constants.h"
 #include "brave/common/shield_exceptions.h"
+#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service.h"
 #include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/brave_shields_util.h"
@@ -96,18 +97,23 @@ void OnBeforeURLRequestAdBlockTPOnTaskRunner(
   bool did_match_exception = false;
   std::string tab_host = ctx->tab_origin.host();
   if (!g_brave_browser_process->ad_block_service()->ShouldStartRequest(
-           ctx->request_url, ctx->resource_type, tab_host,
-           &did_match_exception)) {
+          ctx->request_url, ctx->resource_type, tab_host,
+          &did_match_exception)) {
     ctx->blocked_by = kAdBlocked;
   } else if (!did_match_exception &&
-      !g_brave_browser_process->ad_block_regional_service()
-            ->ShouldStartRequest(ctx->request_url, ctx->resource_type,
-                                 tab_host, &did_match_exception)) {
+             !g_brave_browser_process->ad_block_regional_service()
+                  ->ShouldStartRequest(ctx->request_url, ctx->resource_type,
+                                       tab_host, &did_match_exception)) {
     ctx->blocked_by = kAdBlocked;
   } else if (!did_match_exception &&
-      !g_brave_browser_process->tracking_protection_service()
-          ->ShouldStartRequest(ctx->request_url, ctx->resource_type, tab_host,
-                               &did_match_exception)) {
+             !g_brave_browser_process->ad_block_custom_filters_service()
+                  ->ShouldStartRequest(ctx->request_url, ctx->resource_type,
+                                       tab_host, &did_match_exception)) {
+    ctx->blocked_by = kAdBlocked;
+  } else if (!did_match_exception &&
+             !g_brave_browser_process->tracking_protection_service()
+                  ->ShouldStartRequest(ctx->request_url, ctx->resource_type,
+                                       tab_host, &did_match_exception)) {
     ctx->blocked_by = kTrackerBlocked;
   }
 }
diff --git a/common/pref_names.cc b/common/pref_names.cc
index ee5e84778fa4..14e550b981b2 100644
--- a/common/pref_names.cc
+++ b/common/pref_names.cc
@@ -16,6 +16,7 @@ const char kLastCheckMonth[] = "brave.stats.last_check_month";
 const char kFirstCheckMade[] = "brave.stats.first_check_made";
 const char kWeekOfInstallation[] = "brave.stats.week_of_installation";
 const char kAdBlockCurrentRegion[] = "brave.ad_block.current_region";
+const char kAdBlockCustomFilters[] = "brave.ad_block.custom_filters";
 const char kWidevineOptedIn[] = "brave.widevine_opted_in";
 const char kWidevineInstalledVersion[] = "brave.widevine_installed_version";
 const char kUseAlternativeSearchEngineProvider[] =
diff --git a/common/pref_names.h b/common/pref_names.h
index 921653a5d015..147508c38976 100644
--- a/common/pref_names.h
+++ b/common/pref_names.h
@@ -17,6 +17,7 @@ extern const char kLastCheckMonth[];
 extern const char kFirstCheckMade[];
 extern const char kWeekOfInstallation[];
 extern const char kAdBlockCurrentRegion[];
+extern const char kAdBlockCustomFilters[];
 extern const char kWidevineOptedIn[];
 extern const char kWidevineInstalledVersion[];
 extern const char kUseAlternativeSearchEngineProvider[];
diff --git a/components/brave_shields/browser/BUILD.gn b/components/brave_shields/browser/BUILD.gn
index 0a30d94ad18d..e61046e41f2f 100644
--- a/components/brave_shields/browser/BUILD.gn
+++ b/components/brave_shields/browser/BUILD.gn
@@ -2,6 +2,8 @@ source_set("brave_shields") {
   sources = [
     "ad_block_base_service.cc",
     "ad_block_base_service.h",
+    "ad_block_custom_filters_service.cc",
+    "ad_block_custom_filters_service.h",
     "ad_block_regional_service.cc",
     "ad_block_regional_service.h",
     "ad_block_service.cc",
diff --git a/components/brave_shields/browser/ad_block_custom_filters_service.cc b/components/brave_shields/browser/ad_block_custom_filters_service.cc
new file mode 100644
index 000000000000..bbad2b80355f
--- /dev/null
+++ b/components/brave_shields/browser/ad_block_custom_filters_service.cc
@@ -0,0 +1,56 @@
+/* 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/. */
+
+#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
+
+#include "base/logging.h"
+#include "brave/browser/brave_browser_process_impl.h"
+#include "brave/common/pref_names.h"
+#include "brave/vendor/ad-block/ad_block_client.h"
+#include "components/prefs/pref_service.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace brave_shields {
+
+AdBlockCustomFiltersService::AdBlockCustomFiltersService() {
+}
+
+AdBlockCustomFiltersService::~AdBlockCustomFiltersService() {
+}
+
+bool AdBlockCustomFiltersService::Init() {
+  return UpdateCustomFilters(GetCustomFilters());
+}
+
+std::string AdBlockCustomFiltersService::GetCustomFilters() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  PrefService* local_state = g_browser_process->local_state();
+  if (!local_state)
+    return std::string();
+  return local_state->GetString(kAdBlockCustomFilters);
+}
+
+bool AdBlockCustomFiltersService::UpdateCustomFilters(
+    const std::string& custom_filters) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  PrefService* local_state = g_browser_process->local_state();
+  if (!local_state)
+    return false;
+  local_state->SetString(kAdBlockCustomFilters, custom_filters);
+
+  ad_block_client_->clear();
+  if (custom_filters.empty())
+    return true;
+  return ad_block_client_->parse(custom_filters.c_str());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+std::unique_ptr<AdBlockCustomFiltersService>
+AdBlockCustomFiltersServiceFactory() {
+  return std::make_unique<AdBlockCustomFiltersService>();
+}
+
+}  // namespace brave_shields
diff --git a/components/brave_shields/browser/ad_block_custom_filters_service.h b/components/brave_shields/browser/ad_block_custom_filters_service.h
new file mode 100644
index 000000000000..9fdac8fadea4
--- /dev/null
+++ b/components/brave_shields/browser/ad_block_custom_filters_service.h
@@ -0,0 +1,43 @@
+/* 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_CUSTOM_FILTERS_SERVICE_H_
+#define BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_CUSTOM_FILTERS_SERVICE_H_
+
+#include <memory>
+#include <string>
+
+#include "brave/components/brave_shields/browser/ad_block_base_service.h"
+
+class AdBlockServiceTest;
+
+namespace brave_shields {
+
+// The brave shields service in charge of custom filter ad-block
+// checking and init.
+class AdBlockCustomFiltersService : public AdBlockBaseService {
+ public:
+  AdBlockCustomFiltersService();
+  ~AdBlockCustomFiltersService() override;
+
+  std::string GetCustomFilters();
+  bool UpdateCustomFilters(const std::string& custom_filters);
+
+ protected:
+  bool Init() override;
+
+ private:
+  friend class ::AdBlockServiceTest;
+
+  DISALLOW_COPY_AND_ASSIGN(AdBlockCustomFiltersService);
+};
+
+// Creates the AdBlockCustomFiltersService
+std::unique_ptr<AdBlockCustomFiltersService>
+AdBlockCustomFiltersServiceFactory();
+
+}  // namespace brave_shields
+
+#endif  // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_CUSTOM_FILTERS_SERVICE_H_
diff --git a/components/brave_shields/browser/ad_block_service.cc b/components/brave_shields/browser/ad_block_service.cc
index fadd88984938..ef301731761c 100644
--- a/components/brave_shields/browser/ad_block_service.cc
+++ b/components/brave_shields/browser/ad_block_service.cc
@@ -17,8 +17,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
+#include "brave/common/pref_names.h"
 #include "brave/vendor/ad-block/ad_block_client.h"
 #include "brave/vendor/ad-block/data_file_version.h"
+#include "components/prefs/pref_registry_simple.h"
 
 #define DAT_FILE "ABPFilterParserData.dat"
 
@@ -69,10 +71,13 @@ void AdBlockService::SetDATFileVersionForTest(
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// The brave shields factory. Using the Brave Shields as a singleton
-// is the job of the browser process.
+// The Adblock service factory.
 std::unique_ptr<AdBlockService> AdBlockServiceFactory() {
   return std::make_unique<AdBlockService>();
 }
 
+void RegisterPrefsForAdBlockService(PrefRegistrySimple* registry) {
+  registry->RegisterStringPref(kAdBlockCustomFilters, std::string());
+}
+
 }  // namespace brave_shields
diff --git a/components/brave_shields/browser/ad_block_service.h b/components/brave_shields/browser/ad_block_service.h
index ee8ff7269f20..193f315a20f9 100644
--- a/components/brave_shields/browser/ad_block_service.h
+++ b/components/brave_shields/browser/ad_block_service.h
@@ -58,6 +58,9 @@ class AdBlockService : public AdBlockBaseService {
 // Creates the AdBlockService
 std::unique_ptr<AdBlockService> AdBlockServiceFactory();
 
+// Registers the local_state preferences used by Adblock
+void RegisterPrefsForAdBlockService(PrefRegistrySimple* registry);
+
 }  // namespace brave_shields
 
 #endif  // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_AD_BLOCK_SERVICE_H_
diff --git a/components/brave_shields/browser/brave_resource_dispatcher_host_delegate.cc b/components/brave_shields/browser/brave_resource_dispatcher_host_delegate.cc
index b4c655b74fac..6e651ffdb266 100644
--- a/components/brave_shields/browser/brave_resource_dispatcher_host_delegate.cc
+++ b/components/brave_shields/browser/brave_resource_dispatcher_host_delegate.cc
@@ -1,12 +1,14 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* 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/. */
 
 #include "brave/components/brave_shields/browser/brave_resource_dispatcher_host_delegate.h"
 
 #include "brave/browser/brave_browser_process_impl.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service.h"
+#include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/https_everywhere_service.h"
 #include "brave/components/brave_shields/browser/local_data_files_service.h"
 
@@ -14,6 +16,7 @@ using content::ResourceType;
 
 BraveResourceDispatcherHostDelegate::BraveResourceDispatcherHostDelegate() {
   g_brave_browser_process->ad_block_service()->Start();
+  g_brave_browser_process->ad_block_custom_filters_service()->Start();
   if (brave_shields::AdBlockRegionalService::IsSupportedLocale(
           g_brave_browser_process->GetApplicationLocale()))
     g_brave_browser_process->ad_block_regional_service()->Start();

From 544ce930463127694e3409e4f5286697cf9b02ff Mon Sep 17 00:00:00 2001
From: Emerick Rogul <erogul@brave.com>
Date: Fri, 15 Mar 2019 09:17:12 -0400
Subject: [PATCH 4/6] Add browser test for Adblock custom filters

---
 .../browser/ad_block_service_browsertest.cc   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/components/brave_shields/browser/ad_block_service_browsertest.cc b/components/brave_shields/browser/ad_block_service_browsertest.cc
index 67bae778b458..a50948a99dec 100644
--- a/components/brave_shields/browser/ad_block_service_browsertest.cc
+++ b/components/brave_shields/browser/ad_block_service_browsertest.cc
@@ -8,6 +8,7 @@
 #include "brave/browser/brave_browser_process_impl.h"
 #include "brave/common/brave_paths.h"
 #include "brave/common/pref_names.h"
+#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service.h"
 #include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/local_data_files_service.h"
@@ -245,6 +246,50 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, AdsGetBlockedByDefaultBlocker) {
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL);
 }
 
+// Load a page with an image which is not an ad, and make sure it is NOT
+// blocked by custom filters.
+IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,
+                       NotAdsDoNotGetBlockedByCustomBlocker) {
+  ASSERT_TRUE(g_brave_browser_process->ad_block_custom_filters_service()
+                  ->UpdateCustomFilters("*ad_banner.png"));
+
+  EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
+
+  GURL url = embedded_test_server()->GetURL(kAdBlockTestPage);
+  ui_test_utils::NavigateToURL(browser(), url);
+  content::WebContents* contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+
+  bool as_expected = false;
+  ASSERT_TRUE(ExecuteScriptAndExtractBool(contents,
+                                          "setExpectations(1, 0, 0, 0);"
+                                          "addImage('logo.png')",
+                                          &as_expected));
+  EXPECT_TRUE(as_expected);
+  EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
+}
+
+// Load a page with an ad image, and make sure it is blocked by custom
+// filters.
+IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, AdsGetBlockedByCustomBlocker) {
+  EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
+  ASSERT_TRUE(g_brave_browser_process->ad_block_custom_filters_service()
+                  ->UpdateCustomFilters("*ad_banner.png"));
+
+  GURL url = embedded_test_server()->GetURL(kAdBlockTestPage);
+  ui_test_utils::NavigateToURL(browser(), url);
+  content::WebContents* contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+
+  bool as_expected = false;
+  ASSERT_TRUE(ExecuteScriptAndExtractBool(contents,
+                                          "setExpectations(0, 1, 0, 0);"
+                                          "addImage('ad_banner.png')",
+                                          &as_expected));
+  EXPECT_TRUE(as_expected);
+  EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL);
+}
+
 // Load a page with an image which is not an ad, and make sure it is NOT
 // blocked.
 IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,

From 0bcdf770a04c37619815a328229347e162a444f3 Mon Sep 17 00:00:00 2001
From: Emerick Rogul <erogul@brave.com>
Date: Fri, 15 Mar 2019 15:31:37 -0400
Subject: [PATCH 5/6] Update tags on the custom filters Adblock service too

---
 browser/net/brave_network_delegate_base.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/net/brave_network_delegate_base.cc b/browser/net/brave_network_delegate_base.cc
index 9a25d9c23fb2..41177ccc4baa 100644
--- a/browser/net/brave_network_delegate_base.cc
+++ b/browser/net/brave_network_delegate_base.cc
@@ -11,8 +11,9 @@
 #include "base/task/post_task.h"
 #include "brave/browser/brave_browser_process_impl.h"
 #include "brave/common/pref_names.h"
-#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_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/brave_shields_web_contents_observer.h"
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
@@ -429,4 +430,6 @@ void BraveNetworkDelegateBase::UpdateAdBlockFromPref(
   bool enabled = user_prefs->GetBoolean(pref_name);
   g_brave_browser_process->ad_block_service()->EnableTag(tag, enabled);
   g_brave_browser_process->ad_block_regional_service()->EnableTag(tag, enabled);
+  g_brave_browser_process->ad_block_custom_filters_service()->EnableTag(
+      tag, enabled);
 }

From 0b2a964b5336985610309480ace249edf0021c1d Mon Sep 17 00:00:00 2001
From: Emerick Rogul <erogul@brave.com>
Date: Fri, 15 Mar 2019 15:34:25 -0400
Subject: [PATCH 6/6] Update custom rules on the file task runner

---
 .../browser/ad_block_base_service.h           |  2 +-
 .../ad_block_custom_filters_service.cc        | 24 ++++++++++++++++---
 .../browser/ad_block_custom_filters_service.h |  2 ++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/components/brave_shields/browser/ad_block_base_service.h b/components/brave_shields/browser/ad_block_base_service.h
index 88b59dc30c2a..f2e3c137bc00 100644
--- a/components/brave_shields/browser/ad_block_base_service.h
+++ b/components/brave_shields/browser/ad_block_base_service.h
@@ -44,6 +44,7 @@ class AdBlockBaseService : public BaseBraveShieldsService {
   void GetDATFileData(const base::FilePath& dat_file_path);
   AdBlockClient* GetAdBlockClientForTest();
 
+  SEQUENCE_CHECKER(sequence_checker_);
   std::unique_ptr<AdBlockClient> ad_block_client_;
   DATFileDataBuffer buffer_;
 
@@ -51,7 +52,6 @@ class AdBlockBaseService : public BaseBraveShieldsService {
   void OnDATFileDataReady();
   void OnPreferenceChanges(const std::string& pref_name);
 
-  SEQUENCE_CHECKER(sequence_checker_);
   base::WeakPtrFactory<AdBlockBaseService> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(AdBlockBaseService);
 };
diff --git a/components/brave_shields/browser/ad_block_custom_filters_service.cc b/components/brave_shields/browser/ad_block_custom_filters_service.cc
index bbad2b80355f..9540ae207f77 100644
--- a/components/brave_shields/browser/ad_block_custom_filters_service.cc
+++ b/components/brave_shields/browser/ad_block_custom_filters_service.cc
@@ -8,6 +8,7 @@
 #include "base/logging.h"
 #include "brave/browser/brave_browser_process_impl.h"
 #include "brave/common/pref_names.h"
+#include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/vendor/ad-block/ad_block_client.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
@@ -40,10 +41,27 @@ bool AdBlockCustomFiltersService::UpdateCustomFilters(
     return false;
   local_state->SetString(kAdBlockCustomFilters, custom_filters);
 
+  GetTaskRunner()->PostTask(
+      FROM_HERE,
+      base::BindOnce(
+          &AdBlockCustomFiltersService::UpdateCustomFiltersOnFileTaskRunner,
+          base::Unretained(this), custom_filters));
+
+  return true;
+}
+
+void AdBlockCustomFiltersService::UpdateCustomFiltersOnFileTaskRunner(
+    const std::string& custom_filters) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   ad_block_client_->clear();
-  if (custom_filters.empty())
-    return true;
-  return ad_block_client_->parse(custom_filters.c_str());
+  if (!custom_filters.empty())
+    ad_block_client_->parse(custom_filters.c_str());
+}
+
+scoped_refptr<base::SequencedTaskRunner>
+AdBlockCustomFiltersService::GetTaskRunner() {
+  // We share the same task runner for all ad-block and TP code
+  return g_brave_browser_process->ad_block_service()->GetTaskRunner();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/components/brave_shields/browser/ad_block_custom_filters_service.h b/components/brave_shields/browser/ad_block_custom_filters_service.h
index 9fdac8fadea4..8e580f3e4e9a 100644
--- a/components/brave_shields/browser/ad_block_custom_filters_service.h
+++ b/components/brave_shields/browser/ad_block_custom_filters_service.h
@@ -24,12 +24,14 @@ class AdBlockCustomFiltersService : public AdBlockBaseService {
 
   std::string GetCustomFilters();
   bool UpdateCustomFilters(const std::string& custom_filters);
+  scoped_refptr<base::SequencedTaskRunner> GetTaskRunner() override;
 
  protected:
   bool Init() override;
 
  private:
   friend class ::AdBlockServiceTest;
+  void UpdateCustomFiltersOnFileTaskRunner(const std::string& custom_filters);
 
   DISALLOW_COPY_AND_ASSIGN(AdBlockCustomFiltersService);
 };