Merge pull request #8507 from brave/disable_domain_block

Disable domain blocking via feature flag
brave · Apr 13, 2021 · a058db7 · a058db7
2 parents d03430e + 960a588
commit a058db7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -19,6 +19,7 @@
 #include "brave/common/brave_switches.h"
 #include "brave/common/resource_bundle_helper.h"
 #include "brave/components/brave_ads/browser/buildflags/buildflags.h"
+#include "brave/components/brave_shields/common/features.h"
 #include "brave/renderer/brave_content_renderer_client.h"
 #include "brave/utility/brave_content_utility_client.h"
 #include "build/build_config.h"
@@ -237,6 +238,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     offline_pages::kPrefetchingOfflinePagesFeature.name,
     translate::kTranslate.name,
 #endif
+    brave_shields::features::kBraveDomainBlock.name,
   };
 
 #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_ANDROID)

diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -3,6 +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/common/features.h"
 #include "chrome/browser/domain_reliability/service_factory.h"
 #include "chrome/browser/sharing/features.h"
 #include "chrome/browser/ui/browser.h"
@@ -80,6 +81,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
       &network_time::kNetworkTimeServiceQuerying,
       &safe_browsing::kEnhancedProtection,
       &safe_browsing::kEnhancedProtectionMessageInInterstitials,
+      &brave_shields::features::kBraveDomainBlock,
   };
 
   for (const auto* feature : disabled_features)