Merge pull request #26494 from brave/notreached_fixes

Remove NOTREACHED_IN_MIGRATION usage in decentralized_dns

Author: yrliou

browser/browsing_data/brave_clear_browsing_data_browsertest.cc

@@ -281,10 +281,8 @@ class BraveClearDataOnExitTwoBrowsersTest : public BraveClearDataOnExitTest {
     std::ignore = profile2_dir_.Set(path);
     ProfileManager* profile_manager = g_browser_process->profile_manager();
     size_t starting_number_of_profiles = profile_manager->GetNumberOfProfiles();
-    if (!base::PathExists(path) && !base::CreateDirectory(path)) {
-      NOTREACHED_IN_MIGRATION()
-          << "Could not create directory at " << path.MaybeAsASCII();
-    }
+    CHECK(base::PathExists(path) || base::CreateDirectory(path))
+        << path.MaybeAsASCII();
     Profile* profile = profile_manager->GetProfile(path);
     DCHECK(profile);
     EXPECT_EQ(starting_number_of_profiles + 1,

browser/ui/brave_pages.cc

@@ -75,13 +75,10 @@ void ShowBraveWalletOnboarding(Browser* browser) {
 void ShowBraveWalletAccountCreation(Browser* browser,
                                     brave_wallet::mojom::CoinType coin_type) {
   // Only solana is supported.
-  if (coin_type == brave_wallet::mojom::CoinType::SOL) {
-    ShowSingletonTabOverwritingNTP(
-        browser,
-        GURL(base::StrCat({kBraveUIWalletAccountCreationURL, "Solana"})));
-  } else {
-    NOTREACHED_IN_MIGRATION();
-  }
+  CHECK(coin_type == brave_wallet::mojom::CoinType::SOL);
+  ShowSingletonTabOverwritingNTP(
+      browser,
+      GURL(base::StrCat({kBraveUIWalletAccountCreationURL, "Solana"})));
 }
 
 void ShowExtensionSettings(Browser* browser) {

browser/ui/webui/brave_wallet/android/android_wallet_page_ui.cc

@@ -39,6 +39,8 @@ AndroidWalletPageUI::AndroidWalletPageUI(content::WebUI* web_ui,
                                          const GURL& url)
     : ui::MojoWebUIController(web_ui,
                               true /* Needed for webui browser tests */) {
+  CHECK(url.host() == kWalletPageHost);
+
   auto* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource* source =
       content::WebUIDataSource::CreateAndAdd(profile, kWalletPageHost);
@@ -51,16 +53,11 @@ AndroidWalletPageUI::AndroidWalletPageUI(content::WebUI* web_ui,
   }
 
   // Add required resources.
-  if (url.host() == kWalletPageHost) {
-    webui::SetupWebUIDataSource(
-        source,
-        UNSAFE_TODO(base::make_span(kBraveWalletPageGenerated,
-                                    kBraveWalletPageGeneratedSize)),
-        IDR_WALLET_PAGE_HTML);
-  } else {
-    NOTREACHED_IN_MIGRATION()
-        << "Failed to find page resources for:" << url.path();
-  }
+  webui::SetupWebUIDataSource(
+      source,
+      UNSAFE_TODO(base::make_span(kBraveWalletPageGenerated,
+                                  kBraveWalletPageGeneratedSize)),
+      IDR_WALLET_PAGE_HTML);
 
   source->AddBoolean("isAndroid", true);
   source->AddString("braveWalletLedgerBridgeUrl", kUntrustedLedgerURL);

chromium_src/components/permissions/permission_request.cc

@@ -20,25 +20,17 @@
 // `kWidevine` handled by an override in `WidevinePermissionRequest` and the
 // Brave Ethereum/Solana permission has its own permission request prompt.
 #if BUILDFLAG(IS_ANDROID)
-#define BRAVE_ENUM_ITEMS_FOR_SWITCH                              \
-  case RequestType::kBraveEthereum:                              \
-  case RequestType::kBraveSolana:                                \
-    NOTREACHED_IN_MIGRATION();                                   \
-    return permissions::PermissionRequest::AnnotatedMessageText( \
-        std::u16string(), {});                                   \
-  case RequestType::kWidevine:                                   \
-    NOTREACHED_IN_MIGRATION();                                   \
-    return permissions::PermissionRequest::AnnotatedMessageText( \
-        std::u16string(), {});
+#define BRAVE_ENUM_ITEMS_FOR_SWITCH \
+  case RequestType::kBraveEthereum: \
+  case RequestType::kBraveSolana:   \
+  case RequestType::kWidevine:      \
+    NOTREACHED();
 #else
 #define BRAVE_ENUM_ITEMS_FOR_SWITCH \
   case RequestType::kBraveEthereum: \
   case RequestType::kBraveSolana:   \
-    NOTREACHED_IN_MIGRATION();      \
-    return std::u16string();        \
   case RequestType::kWidevine:      \
-    NOTREACHED_IN_MIGRATION();      \
-    return std::u16string();
+    NOTREACHED();
 #endif
 
 // For permission strings that we also need on Android, we need to use

components/ai_chat/renderer/ai_chat_resource_sniffer_throttle_unittest.cc

@@ -63,8 +63,7 @@ class MojoDataPipeSender {
         // Just wait until OnWritable() is called by the watcher.
         return;
       default:
-        NOTREACHED_IN_MIGRATION();
-        return;
+        NOTREACHED();
     }
     sent_bytes_ += actually_written_bytes;
     if (data_.size() == sent_bytes_) {
@@ -182,10 +181,9 @@ class MockDelegate : public blink::URLLoaderThrottle::Delegate {
         return 0;
       case MOJO_RESULT_SHOULD_WAIT:
         return 0;
-      default:
-        NOTREACHED_IN_MIGRATION();
     }
-    return 0;
+
+    NOTREACHED();
   }
 
   void ResetProducer() { source_body_handle_.reset(); }

components/decentralized_dns/content/decentralized_dns_interstitial_controller_client.cc

@@ -63,8 +63,7 @@ void DecentralizedDnsInterstitialControllerClient::SetResolveMethodAndReload(
   } else if (IsSnsTLD(request_url_.host_piece())) {
     pref_name = kSnsResolveMethod;
   } else {
-    NOTREACHED_IN_MIGRATION();
-    return;
+    NOTREACHED();
   }
 
   local_state_->SetInteger(pref_name, static_cast<int>(type));

components/decentralized_dns/content/decentralized_dns_opt_in_page.cc

@@ -58,13 +58,13 @@ void DecentralizedDnsOptInPage::CommandReceived(const std::string& command) {
     case security_interstitials::CMD_DONT_PROCEED:
       static_cast<DecentralizedDnsInterstitialControllerClient*>(controller())
           ->DontProceed();
-      break;
+      return;
     case security_interstitials::CMD_PROCEED:
       controller()->Proceed();
-      break;
-    default:
-      NOTREACHED_IN_MIGRATION() << "Unsupported command: " << command;
+      return;
   }
+
+  NOTREACHED() << "Unsupported command: " << command;
 }
 
 void DecentralizedDnsOptInPage::PopulateInterstitialStrings(
@@ -130,7 +130,7 @@ void DecentralizedDnsOptInPage::PopulateInterstitialStrings(
                                IDS_SNS_OPT_IN_PRIMARY_PARAGRAPH),
                            {sol_domain, sns_wiki_link}, nullptr));
   } else {
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 
   if (IsSnsTLD(request_url_.host_piece())) {

components/decentralized_dns/content/ens_offchain_lookup_opt_in_page.cc

@@ -56,13 +56,13 @@ void EnsOffchainLookupOptInPage::CommandReceived(const std::string& command) {
     case security_interstitials::CMD_DONT_PROCEED:
       static_cast<EnsOffchainLookupInterstitialControllerClient*>(controller())
           ->DontProceed();
-      break;
+      return;
     case security_interstitials::CMD_PROCEED:
       controller()->Proceed();
-      break;
-    default:
-      NOTREACHED_IN_MIGRATION() << "Unsupported command: " << command;
+      return;
   }
+
+  NOTREACHED() << "Unsupported command: " << command;
 }
 
 void EnsOffchainLookupOptInPage::PopulateInterstitialStrings(