Revert "Merge pull request #8291 from brave/uplift_UD_ENS_1.22.x"

This reverts commit e104d7c, reversing
changes made to 5b3f345.

app/brave_generated_resources.grd

@@ -694,12 +694,6 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_SETTINGS_GOOGLE_LOGIN_FOR_EXTENSIONS" desc="Label for a switch control which allows Google login for extension">
         Allow Google login for extensions
       </message>
-      <message name="IDS_SETTINGS_RESOLVE_UNSTOPPABLE_DOMAINS_DESC" desc="The description for how to handle Unstoppable Domains">
-        Method to resolve Unstoppable Domains
-      </message>
-      <message name="IDS_SETTINGS_RESOLVE_ENS_DESC" desc="The description for how to handle ENS">
-        Method to resolve Ethereum Name Service (ENS)
-      </message>
       <message name="IDS_SETTINGS_RESOLVE_IPFS_URLS_DESC" desc="The description for how to handle IPFS URIs">
         Method to resolve IPFS resources
       </message>

browser/BUILD.gn

@@ -10,7 +10,6 @@ import("//brave/components/brave_wallet/buildflags/buildflags.gni")
 import("//brave/components/brave_wayback_machine/buildflags/buildflags.gni")
 import("//brave/components/brave_webtorrent/browser/buildflags/buildflags.gni")
 import("//brave/components/crypto_dot_com/browser/buildflags/buildflags.gni")
-import("//brave/components/decentralized_dns/buildflags/buildflags.gni")
 import("//brave/components/gemini/browser/buildflags/buildflags.gni")
 import("//brave/components/greaselion/browser/buildflags/buildflags.gni")
 import("//brave/components/ipfs/buildflags/buildflags.gni")
@@ -144,7 +143,6 @@ source_set("browser_process") {
     "//brave/components/cosmetic_filters/browser",
     "//brave/components/cosmetic_filters/common:mojom",
     "//brave/components/crypto_dot_com/browser/buildflags",
-    "//brave/components/decentralized_dns/buildflags",
     "//brave/components/gemini/browser/buildflags",
     "//brave/components/greaselion/browser/buildflags",
     "//brave/components/ipfs/buildflags",
@@ -291,10 +289,6 @@ source_set("browser_process") {
     ]
   }
 
-  if (decentralized_dns_enabled) {
-    deps += [ "//brave/browser/decentralized_dns" ]
-  }
-
   if (ipfs_enabled) {
     sources += [
       "ipfs/content_browser_client_helper.cc",

browser/brave_content_browser_client.cc

@@ -31,7 +31,6 @@
 #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/decentralized_dns/buildflags/buildflags.h"
 #include "brave/components/gemini/browser/buildflags/buildflags.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/speedreader/buildflags.h"
@@ -89,10 +88,6 @@ using extensions::ChromeContentBrowserClientExtensionsPart;
 #include "brave/components/ipfs/ipfs_navigation_throttle.h"
 #endif
 
-#if BUILDFLAG(DECENTRALIZED_DNS_ENABLED)
-#include "brave/components/decentralized_dns/decentralized_dns_navigation_throttle.h"
-#endif
-
 #if BUILDFLAG(BRAVE_REWARDS_ENABLED)
 #include "brave/components/brave_rewards/browser/rewards_protocol_handler.h"
 #endif
@@ -590,8 +585,7 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
       std::make_unique<extensions::BraveWebTorrentNavigationThrottle>(handle));
 #endif
 
-#if BUILDFLAG(ENABLE_TOR) || BUILDFLAG(IPFS_ENABLED) || \
-    BUILDFLAG(DECENTRALIZED_DNS_ENABLED)
+#if BUILDFLAG(ENABLE_TOR) ||BUILDFLAG(IPFS_ENABLED)
   content::BrowserContext* context =
       handle->GetWebContents()->GetBrowserContext();
 #endif
@@ -624,15 +618,5 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
     throttles.push_back(std::move(ipfs_navigation_throttle));
 #endif
 
-#if BUILDFLAG(DECENTRALIZED_DNS_ENABLED)
-  std::unique_ptr<content::NavigationThrottle>
-      decentralized_dns_navigation_throttle = decentralized_dns::
-          DecentralizedDnsNavigationThrottle::MaybeCreateThrottleFor(
-              handle, g_brave_browser_process->local_state(),
-              g_brave_browser_process->GetApplicationLocale());
-  if (decentralized_dns_navigation_throttle)
-    throttles.push_back(std::move(decentralized_dns_navigation_throttle));
-#endif
-
   return throttles;
 }

browser/brave_local_state_prefs.cc

@@ -13,7 +13,6 @@
 #include "brave/components/brave_referrals/buildflags/buildflags.h"
 #include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/brave_shields_p3a.h"
-#include "brave/components/decentralized_dns/buildflags/buildflags.h"
 #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h"
 #include "brave/components/ntp_background_images/browser/view_counter_service.h"
 #include "brave/components/p3a/brave_p3a_service.h"
@@ -43,10 +42,6 @@
 #include "brave/browser/widevine/widevine_utils.h"
 #endif
 
-#if BUILDFLAG(DECENTRALIZED_DNS_ENABLED)
-#include "brave/components/decentralized_dns/decentralized_dns_service.h"
-#endif
-
 namespace brave {
 
 void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -100,10 +95,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
   RegisterWidevineLocalstatePrefs(registry);
 #endif
 
-#if BUILDFLAG(DECENTRALIZED_DNS_ENABLED)
-  decentralized_dns::DecentralizedDnsService::RegisterLocalStatePrefs(registry);
-#endif
-
   RegisterLocalStatePrefsForMigration(registry);
 }