Migrate remaining NOTREACHED()s in components/

NOTREACHED() and NOTREACHED_IN_MIGRATION() are both CHECK-fatal now.
The former is [[noreturn]] so this CL also performs dead-code removal
after the NOTREACHED().

This CL does not attempt to do additional rewrites of any surrounding
code, like:

if (!foo) {
  NOTREACHED();
}

to CHECK(foo);

Those transforms take a non-trivial amount of time (and there are
thousands of instances). Cleanup can be left as an exercise for the
reader.

Bug: 40580068
Change-Id: I72205fb77747957c6bf33dbea93656fd20085a42
Low-Coverage-Reason: OTHER Should-be-unreachable code
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6010008
Reviewed-by: Rick Byers <rbyers@chromium.org>
Owners-Override: Rick Byers <rbyers@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1382618}

components/account_id/account_id.cc

@@ -74,9 +74,8 @@ bool AccountId::operator==(const AccountId& other) const {
     case AccountType::ACTIVE_DIRECTORY:
       return id_ == other.id_ && user_email_ == other.user_email_;
     default:
-      NOTREACHED_IN_MIGRATION() << "Unknown account type";
+      NOTREACHED() << "Unknown account type";
   }
-  return false;
 }
 
 bool AccountId::operator!=(const AccountId& other) const {
@@ -104,8 +103,7 @@ bool AccountId::is_valid() const {
     case AccountType::UNKNOWN:
       return id_.empty() && !user_email_.empty();
   }
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 void AccountId::clear() {
@@ -152,9 +150,8 @@ const std::string AccountId::GetAccountIdKey() const {
     case AccountType::ACTIVE_DIRECTORY:
       return std::string(kKeyAdIdPrefix) + id_;
     default:
-      NOTREACHED_IN_MIGRATION() << "Unknown account type";
+      NOTREACHED() << "Unknown account type";
   }
-  return std::string();
 }
 
 void AccountId::SetUserEmail(std::string_view email) {
@@ -201,8 +198,7 @@ AccountType AccountId::StringToAccountType(
     return AccountType::ACTIVE_DIRECTORY;
   if (account_type_string == kUnknown)
     return AccountType::UNKNOWN;
-  NOTREACHED_IN_MIGRATION() << "Unknown account type " << account_type_string;
-  return AccountType::UNKNOWN;
+  NOTREACHED() << "Unknown account type " << account_type_string;
 }
 
 // static

components/account_id/mojom/account_id_traits.h

@@ -23,8 +23,7 @@ struct EnumTraits<signin::mojom::AccountType, AccountType> {
       case AccountType::ACTIVE_DIRECTORY:
         return signin::mojom::AccountType::ACTIVE_DIRECTORY;
     }
-    NOTREACHED_IN_MIGRATION();
-    return signin::mojom::AccountType::UNKNOWN;
+    NOTREACHED();
   }
 
   static bool FromMojom(signin::mojom::AccountType input, AccountType* out) {
@@ -39,8 +38,7 @@ struct EnumTraits<signin::mojom::AccountType, AccountType> {
         *out = AccountType::ACTIVE_DIRECTORY;
         return true;
     }
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 };
 
@@ -61,8 +59,7 @@ struct StructTraits<signin::mojom::AccountIdDataView, AccountId> {
         // Return an empty string for such accounts.
         return std::string();
     }
-    NOTREACHED_IN_MIGRATION();
-    return std::string();
+    NOTREACHED();
   }
   static std::string user_email(const AccountId& r) { return r.GetUserEmail(); }
 

components/account_manager_core/account_manager_facade_impl.cc

@@ -119,12 +119,10 @@ bool GetIsAvailableInArcBySource(
         kChromeOSProjectorAppReauth:
     case AccountManagerFacade::AccountAdditionSource::
         kChromeSettingsReauthAccountButton:
-      NOTREACHED_IN_MIGRATION();
-      return false;
+      NOTREACHED();
     // Unused enums that cannot be deleted.
     case AccountManagerFacade::AccountAdditionSource::kPrintPreviewDialogUnused:
-      NOTREACHED_IN_MIGRATION();
-      return false;
+      NOTREACHED();
   }
 }
 

components/account_manager_core/account_manager_facade_impl_unittest.cc

@@ -425,7 +425,7 @@ TEST_F(AccountManagerFacadeImplTest, GetAccountsHangsWhenRemoteIsNull) {
   base::OnceCallback<void(const std::vector<Account>&)> dropped_callback =
       base::BindLambdaForTesting(
           [scoped_closure = std::move(scoped_closure)](
-              const std::vector<Account>&) { NOTREACHED_IN_MIGRATION(); });
+              const std::vector<Account>&) { NOTREACHED(); });
   EXPECT_FALSE(callback_was_dropped);
   account_manager_facade->GetAccounts(std::move(dropped_callback));
   // `dropped_callback` was destroyed without being run.

components/account_manager_core/account_manager_util.cc

@@ -65,8 +65,7 @@ ToMojoInvalidGaiaCredentialsReason(
       return cm::GoogleServiceAuthError::InvalidGaiaCredentialsReason::
           kCredentialsMissing;
     case GoogleServiceAuthError::InvalidGaiaCredentialsReason::NUM_REASONS:
-      NOTREACHED_IN_MIGRATION();
-      return cm::GoogleServiceAuthError::InvalidGaiaCredentialsReason::kUnknown;
+      NOTREACHED();
   }
 }
 
@@ -94,8 +93,7 @@ crosapi::mojom::GoogleServiceAuthError::State ToMojoGoogleServiceAuthErrorState(
     case GoogleServiceAuthError::State::CHALLENGE_RESPONSE_REQUIRED:
       return cm::GoogleServiceAuthError::State::kChallengeResponseRequired;
     case GoogleServiceAuthError::State::NUM_STATES:
-      NOTREACHED_IN_MIGRATION();
-      return cm::GoogleServiceAuthError::State::kNone;
+      NOTREACHED();
   }
 }
 
@@ -147,11 +145,7 @@ crosapi::mojom::AccountUpsertionResult::Status ToMojoAccountAdditionStatus(
       // entirely on the remote side when the receiver can't even be reached.
       // They do not have any Mojo equivalent since they are never passed over
       // the wire in the first place.
-      NOTREACHED_IN_MIGRATION()
-          << "These statuses should not be passed over the wire";
-      // Return something to make the compiler happy. This should never happen
-      // in production.
-      return cm::AccountUpsertionResult::Status::kUnexpectedResponse;
+      NOTREACHED() << "These statuses should not be passed over the wire";
   }
 }
 

components/account_manager_core/account_manager_util_unittest.cc

@@ -12,14 +12,14 @@ namespace account_manager {
 
 TEST(AccountManagerUtilDeathTest,
      ToMojoAccountUpsertionResultDiesForRemoteDisconnectedStatus) {
-  EXPECT_DCHECK_DEATH(
+  EXPECT_NOTREACHED_DEATH(
       ToMojoAccountUpsertionResult(AccountUpsertionResult::FromStatus(
           AccountUpsertionResult::Status::kMojoRemoteDisconnected)));
 }
 
 TEST(AccountManagerUtilDeathTest,
      ToMojoAccountUpsertionResultDiesForIncompatibleMojoVersionsStatus) {
-  EXPECT_DCHECK_DEATH(
+  EXPECT_NOTREACHED_DEATH(
       ToMojoAccountUpsertionResult(AccountUpsertionResult::FromStatus(
           AccountUpsertionResult::Status::kIncompatibleMojoVersions)));
 }

components/android_autofill/browser/android_autofill_client.cc

@@ -180,13 +180,13 @@ void AndroidAutofillClient::ShowAutofillSettings(
 void AndroidAutofillClient::ShowEditAddressProfileDialog(
     const autofill::AutofillProfile& profile,
     AddressProfileSavePromptCallback on_user_decision_callback) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void AndroidAutofillClient::ShowDeleteAddressProfileDialog(
     const autofill::AutofillProfile& profile,
     AddressProfileDeleteDialogCallback delete_dialog_callback) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void AndroidAutofillClient::ConfirmSaveAddressProfile(

components/android_autofill/browser/android_autofill_manager.cc

@@ -269,8 +269,7 @@ AndroidFormEventLogger* AndroidAutofillManager::GetEventFormLogger(
     case FormType::kUnknownFormType:
       return nullptr;
   }
-  NOTREACHED_IN_MIGRATION();
-  return nullptr;
+  NOTREACHED();
 }
 
 }  // namespace autofill

components/arc/intent_helper/arc_intent_helper_bridge.cc

@@ -291,8 +291,7 @@ void ArcIntentHelperBridge::IsChromeAppEnabled(
     return;
   }
 
-  NOTREACHED_IN_MIGRATION() << "Unknown chrome app";
-  std::move(callback).Run(false);
+  NOTREACHED() << "Unknown chrome app";
 }
 
 void ArcIntentHelperBridge::OnSupportedLinksChanged(

components/assist_ranker/ranker_example_util.cc

@@ -113,15 +113,11 @@ bool FeatureToInt64(const Feature& feature,
       if (index >= 0 && index < feature.string_list().string_value_size()) {
         value = StringToIntBits(feature.string_list().string_value(index));
       } else {
-        DVLOG(3) << "Invalid index for string list: " << index;
-        NOTREACHED_IN_MIGRATION();
-        return false;
+        NOTREACHED() << "Invalid index for string list: " << index;
       }
       break;
     default:
-      DVLOG(3) << "Feature type is supported for logging: " << type;
-      NOTREACHED_IN_MIGRATION();
-      return false;
+      NOTREACHED() << "Feature type is supported for logging: " << type;
   }
   *res = PairInt(type, value, index);
   return true;

components/assist_ranker/ranker_url_fetcher.cc

@@ -34,8 +34,7 @@ bool RankerURLFetcher::Request(
   // This function is not supposed to be called if the previous operation is not
   // finished.
   if (state_ == REQUESTING) {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   if (retry_count_ >= kMaxRetry)

components/background_fetch/background_fetch_delegate_base.cc

@@ -203,7 +203,7 @@ JobDetails* BackgroundFetchDelegateBase::GetJobDetails(
   auto job_details_iter = job_details_map_.find(job_id);
   if (job_details_iter == job_details_map_.end()) {
     if (!allow_null) {
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
     }
 
     return nullptr;
@@ -403,24 +403,20 @@ void BackgroundFetchDelegateBase::OnDownloadReceived(
       break;
     case StartResult::BACKOFF:
       // TODO(delphick): try again later?
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case StartResult::UNEXPECTED_CLIENT:
       // This really should never happen since we're supplying the
       // DownloadClient.
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case StartResult::CLIENT_CANCELLED:
       // TODO(delphick): do we need to do anything here, since we will have
       // cancelled it?
       break;
     case StartResult::INTERNAL_ERROR:
       // TODO(delphick): We need to handle this gracefully.
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case StartResult::COUNT:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
 }
 

components/background_sync/background_sync_permission_context.cc

@@ -19,5 +19,5 @@ void BackgroundSyncPermissionContext::DecidePermission(
     permissions::PermissionRequestData request_Data,
     permissions::BrowserPermissionCallback callback) {
   // The user should never be prompted to authorize background sync.
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }

components/blocked_content/android/popup_blocked_infobar_delegate.cc

@@ -100,10 +100,8 @@ std::u16string PopupBlockedInfoBarDelegate::GetButtonLabel(
     case BUTTON_CANCEL:
       return l10n_util::GetStringUTF16(IDS_PERMISSION_DENY);
     default:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
-  return std::u16string();
 }
 
 bool PopupBlockedInfoBarDelegate::Accept() {

components/blocked_content/popup_blocker_tab_helper.cc

@@ -132,8 +132,7 @@ void PopupBlockerTabHelper::ShowBlockedPopup(
 
   switch (popup->block_type) {
     case PopupBlockType::kNotBlocked:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case PopupBlockType::kNoGesture:
       LogAction(Action::kClickedThroughNoGesture);
       break;

components/bookmarks/browser/bookmark_client.cc

@@ -31,7 +31,7 @@ bool BookmarkClient::SupportsTypedCountForUrls() {
 
 void BookmarkClient::GetTypedCountForUrls(
     UrlTypedCountMap* url_typed_count_map) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 }  // namespace bookmarks

components/bookmarks/browser/bookmark_codec.cc

@@ -272,14 +272,12 @@ bool BookmarkCodec::DecodeNode(const base::Value::Dict& value,
   // If no |node| is specified, we'll create one and add it to the |parent|.
   // Therefore, in that case, |parent| must be non-NULL.
   if (!node && !parent) {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   // It's not valid to have both a node and a specified parent.
   if (node && parent) {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   std::string id_string;

components/bookmarks/browser/bookmark_model.cc

@@ -582,8 +582,7 @@ void BookmarkModel::SetTitle(const BookmarkNode* node,
   }
 
   if (is_permanent_node(node) && !client_->CanSetPermanentNodeTitle(node)) {
-    NOTREACHED_IN_MIGRATION();
-    return;
+    NOTREACHED();
   }
 
   for (BookmarkModelObserver& observer : observers_) {

components/bookmarks/browser/bookmark_model_unittest.cc

@@ -364,7 +364,7 @@ class BookmarkModelTest : public testing::Test, public BookmarkModelObserver {
 
   void BookmarkModelLoaded(bool ids_reassigned) override {
     // We never load from the db, so that this should never get invoked.
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 
   void BookmarkNodeMoved(const BookmarkNode* old_parent,

components/bookmarks/browser/bookmark_node_data_ios.cc

@@ -10,17 +10,15 @@ namespace bookmarks {
 
 // static
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 void BookmarkNodeData::WriteToClipboard(bool is_off_the_record) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardBuffer buffer) {
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 }  // namespace bookmarks

components/bookmarks/browser/bookmark_utils.cc

@@ -245,8 +245,7 @@ void CloneBookmarkNode(BookmarkModel* model,
                        size_t index_to_add_at,
                        bool reset_node_times) {
   if (!parent->is_folder() || !model) {
-    NOTREACHED_IN_MIGRATION();
-    return;
+    NOTREACHED();
   }
   for (size_t i = 0; i < elements.size(); ++i) {
     CloneBookmarkNodeImpl(model, elements[i], parent, index_to_add_at + i,
@@ -311,7 +310,7 @@ void MakeTitleUnique(const BookmarkModel* model,
       return;
     }
   }
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void PasteFromClipboard(BookmarkModel* model,

components/bookmarks/managed/managed_bookmarks_tracker.cc

@@ -177,16 +177,14 @@ bool ManagedBookmarksTracker::LoadBookmark(const base::Value::List& list,
   const base::Value::Dict* dict = list[index].GetIfDict();
   if (!dict) {
     // Should never happen after policy validation.
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
   const std::string* name = dict->FindString(kName);
   const std::string* spec = dict->FindString(kUrl);
   const base::Value::List* children_list = dict->FindList(kChildren);
   if (!name || (!spec && !children_list)) {
     // Should never happen after policy validation.
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   *title = base::UTF8ToUTF16(*name);

components/browser_ui/site_settings/android/website_preference_bridge.cc

@@ -916,8 +916,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled(
         value = CONTENT_SETTING_ALLOW;
         break;
       default:
-        NOTREACHED_IN_MIGRATION()
-            << static_cast<int>(type);  // Not supported on Android.
+        NOTREACHED() << static_cast<int>(type);  // Not supported on Android.
     }
   }
 

components/browsing_data/content/browsing_data_model.cc

@@ -102,9 +102,7 @@ BrowsingDataModel::DataOwner GetDataOwner::GetOwningOriginOrHost<url::Origin>(
     return GetOwnerBasedOnScheme(data_key);
   }
 
-  NOTREACHED_IN_MIGRATION()
-      << "Unexpected StorageType: " << static_cast<int>(storage_type_);
-  return "";
+  NOTREACHED() << "Unexpected StorageType: " << static_cast<int>(storage_type_);
 }
 
 template <>
@@ -121,9 +119,8 @@ GetDataOwner::GetOwningOriginOrHost<blink::StorageKey>(
     case BrowsingDataModel::StorageType::kCdmStorage:
       return GetOwnerBasedOnScheme(data_key.origin());
     default:
-      NOTREACHED_IN_MIGRATION()
-          << "Unexpected StorageType: " << static_cast<int>(storage_type_);
-      return "";
+      NOTREACHED() << "Unexpected StorageType: "
+                   << static_cast<int>(storage_type_);
   }
 }
 
@@ -352,7 +349,7 @@ void StorageRemoverHelper::Visitor::operator()<
         ->ClearSharedDictionaryCacheForIsolationKey(
             isolation_key, helper->GetCompleteCallback());
   } else {
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 }
 
@@ -374,7 +371,7 @@ void StorageRemoverHelper::Visitor::operator()<net::CanonicalCookie>(
                               bool deleted) { std::move(callback).Run(); },
                            helper->GetCompleteCallback()));
   } else {
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 }
 

components/browsing_data/content/browsing_data_quota_helper_impl.cc

@@ -136,7 +136,7 @@ void BrowsingDataQuotaHelperImpl::GotStorageKeyUsage(
       (*quota_info)[storage_key].syncable_usage += usage;
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 

components/browsing_data/content/fake_browsing_data_model.cc

@@ -25,5 +25,5 @@ void FakeBrowsingDataModel::RemoveBrowsingDataEntriesFromDisk(
 
 void FakeBrowsingDataModel::PopulateFromDisk(
     base::OnceClosure finished_callback) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }

components/browsing_data/core/browsing_data_utils.cc

@@ -204,7 +204,7 @@ std::u16string GetCounterTextFromResult(
             IDS_DEL_PASSWORDS_AND_SIGNIN_DATA_COUNTER_COMBINATION, parts[0],
             parts[1]);
       default:
-        NOTREACHED_IN_MIGRATION();
+        NOTREACHED();
     }
   }
 
@@ -225,7 +225,7 @@ std::u16string GetCounterTextFromResult(
 
   if (pref_name == prefs::kDeleteBrowsingHistoryBasic) {
     // The basic tab doesn't show history counter results.
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 
   if (pref_name == prefs::kDeleteBrowsingHistory) {
@@ -277,7 +277,7 @@ std::u16string GetCounterTextFromResult(
               IDS_DEL_AUTOFILL_COUNTER_SUGGESTIONS_SHORT, num_suggestions));
           break;
         default:
-          NOTREACHED_IN_MIGRATION();
+          NOTREACHED();
       }
     }
 
@@ -315,7 +315,7 @@ std::u16string GetCounterTextFromResult(
                 displayed_strings[2]);
         break;
       default:
-        NOTREACHED_IN_MIGRATION();
+        NOTREACHED();
     }
 
     AutofillCounter::ResultInt num_user_annotations =
@@ -332,8 +332,7 @@ std::u16string GetCounterTextFromResult(
     }
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return std::u16string();
+  NOTREACHED();
 }
 
 const char* GetTimePeriodPreferenceName(
@@ -396,8 +395,7 @@ bool GetDeletionPreferenceFromDataType(
       *out_pref = prefs::kCloseTabs;
       return true;
   }
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 std::optional<BrowsingDataType> GetDataTypeFromDeletionPreference(

components/browsing_data/core/counters/browsing_data_counter.cc

@@ -139,8 +139,7 @@ void BrowsingDataCounter::ReportResult(std::unique_ptr<Result> result) {
       DUMP_WILL_BE_NOTREACHED() << "State::IDLE";
       return;
     case State::REPORT_STAGED_RESULT:
-      NOTREACHED_IN_MIGRATION() << "State::REPORT_STAGED_RESULT";
-      return;
+      NOTREACHED() << "State::REPORT_STAGED_RESULT";
   }
 }
 

components/browsing_topics/annotator_impl.cc

@@ -65,9 +65,8 @@ std::optional<std::unordered_map<std::string, std::vector<int32_t>>>
 LoadOverrideListFromFile(const base::FilePath& path) {
   if (!path.IsAbsolute() ||
       path.BaseName() != base::FilePath(kOverrideListBasePath)) {
-    NOTREACHED_IN_MIGRATION();
     // This is enforced by calling code, so no UMA in this case.
-    return std::nullopt;
+    NOTREACHED();
   }
 
   std::string file_contents;

components/captive_portal/content/captive_portal_tab_reloader.cc

@@ -173,7 +173,7 @@ void CaptivePortalTabReloader::OnCaptivePortalResults(
       return;
 
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 
@@ -233,8 +233,7 @@ void CaptivePortalTabReloader::SetState(State new_state) {
       DCHECK_EQ(STATE_NONE, new_state);
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
 
   state_ = new_state;

components/cast/message_port/fuchsia/message_port_fuchsia.cc

@@ -36,8 +36,7 @@ class MessagePortFuchsiaClient : public MessagePortFuchsia {
 
   fidl::InterfaceRequest<::fuchsia::web::MessagePort> TakeServiceRequest()
       final {
-    NOTREACHED_IN_MIGRATION();
-    return {};
+    NOTREACHED();
   }
 
   // MessagePort implementation.
@@ -130,8 +129,7 @@ class MessagePortFuchsiaServer : public MessagePortFuchsia,
 
   // MessagePortFuchsia implementation.
   fidl::InterfaceHandle<::fuchsia::web::MessagePort> TakeClientHandle() final {
-    NOTREACHED_IN_MIGRATION();
-    return {};
+    NOTREACHED();
   }
 
   fidl::InterfaceRequest<::fuchsia::web::MessagePort> TakeServiceRequest()

components/cast_streaming/browser/cast_message_port_converter_trivial.cc

@@ -11,8 +11,7 @@ namespace cast_streaming {
 std::unique_ptr<CastMessagePortConverter> CastMessagePortConverter::Create(
     ReceiverSession::MessagePortProvider message_port_provider,
     base::OnceClosure on_close) {
-  NOTREACHED_IN_MIGRATION();
-  return nullptr;
+  NOTREACHED();
 }
 
 }  // namespace cast_streaming

components/cast_streaming/renderer/control/playback_command_forwarding_renderer.cc

@@ -120,7 +120,7 @@ void PlaybackCommandForwardingRenderer::Initialize(
 void PlaybackCommandForwardingRenderer::SetCdm(media::CdmContext* cdm_context,
                                                CdmAttachedCB cdm_attached_cb) {
   // CDM should not be set for current mirroring use cases.
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void PlaybackCommandForwardingRenderer::SetLatencyHint(
@@ -254,8 +254,7 @@ void PlaybackCommandForwardingRenderer::MojoRendererSetVolume(float volume) {
 void PlaybackCommandForwardingRenderer::MojoRendererSetCdm(
     const std::optional<::base::UnguessableToken>& cdm_id,
     media::mojom::Renderer::SetCdmCallback callback) {
-  NOTREACHED_IN_MIGRATION()
-      << "Use of a CDM is not supported by the remoting protocol.";
+  NOTREACHED() << "Use of a CDM is not supported by the remoting protocol.";
 }
 
 void PlaybackCommandForwardingRenderer::OnError(media::PipelineStatus status) {

components/cast_streaming/renderer/frame/frame_injecting_demuxer.cc

@@ -292,10 +292,7 @@ class FrameInjectingAudioDemuxerStream final
  private:
   // DemuxerStream remainder of implementation.
   media::AudioDecoderConfig audio_decoder_config() final { return config(); }
-  media::VideoDecoderConfig video_decoder_config() final {
-    NOTREACHED_IN_MIGRATION();
-    return media::VideoDecoderConfig();
-  }
+  media::VideoDecoderConfig video_decoder_config() final { NOTREACHED(); }
   Type type() const final { return Type::AUDIO; }
 };
 
@@ -309,10 +306,7 @@ class FrameInjectingVideoDemuxerStream final
 
  private:
   // DemuxerStream remainder of implementation.
-  media::AudioDecoderConfig audio_decoder_config() final {
-    NOTREACHED_IN_MIGRATION();
-    return media::AudioDecoderConfig();
-  }
+  media::AudioDecoderConfig audio_decoder_config() final { NOTREACHED(); }
   media::VideoDecoderConfig video_decoder_config() final { return config(); }
   Type type() const final { return Type::VIDEO; }
 };

components/cbor/diagnostic_writer.cc

@@ -140,8 +140,7 @@ static bool Serialize(const Value& node,
           s->append("undefined");
           break;
         default:
-          NOTREACHED_IN_MIGRATION();
-          break;
+          NOTREACHED();
       }
       break;
     case Value::Type::FLOAT_VALUE:
@@ -152,8 +151,7 @@ static bool Serialize(const Value& node,
       break;
 
     case Value::Type::TAG:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
 
   return true;

components/cbor/reader.cc

@@ -288,9 +288,7 @@ std::optional<Value> Reader::DecodeToSimpleValueOrFloat(
         return Value(result);
       }
       default:
-        NOTREACHED_IN_MIGRATION();
-        error_code_ = DecoderError::UNSUPPORTED_SIMPLE_VALUE;
-        return std::nullopt;
+        NOTREACHED();
     }
   }
 
@@ -502,8 +500,7 @@ const char* Reader::ErrorCodeToString(DecoderError error) {
     case DecoderError::UNKNOWN_ERROR:
       return kUnknownError;
     default:
-      NOTREACHED_IN_MIGRATION();
-      return "Unknown error code.";
+      NOTREACHED();
   }
 }
 

components/cbor/values.cc

@@ -50,8 +50,7 @@ Value::Value(Type type) : type_(type) {
       new (&map_value_) MapValue();
       return;
     case Type::TAG:
-      NOTREACHED_IN_MIGRATION() << constants::kUnsupportedMajorType;
-      return;
+      NOTREACHED() << constants::kUnsupportedMajorType;
     case Type::SIMPLE_VALUE:
       simple_value_ = Value::SimpleValue::UNDEFINED;
       return;
@@ -61,7 +60,7 @@ Value::Value(Type type) : type_(type) {
     case Type::NONE:
       return;
   }
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 Value::Value(SimpleValue in_simple)
@@ -111,7 +110,7 @@ Value::Value(std::string&& in_string, Type type) noexcept : type_(type) {
       bytestring_value_ = BinaryValue(in_string.begin(), in_string.end());
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 
@@ -127,7 +126,7 @@ Value::Value(std::string_view in_string, Type type) : type_(type) {
       bytestring_value_ = BinaryValue(in_string.begin(), in_string.end());
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 
@@ -179,16 +178,14 @@ Value Value::Clone() const {
     case Type::MAP:
       return Value(map_value_);
     case Type::TAG:
-      NOTREACHED_IN_MIGRATION() << constants::kUnsupportedMajorType;
-      return Value();
+      NOTREACHED() << constants::kUnsupportedMajorType;
     case Type::SIMPLE_VALUE:
       return Value(simple_value_);
     case Type::FLOAT_VALUE:
       return Value(float_value_);
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return Value();
+  NOTREACHED();
 }
 
 Value::SimpleValue Value::GetSimpleValue() const {
@@ -278,8 +275,7 @@ void Value::InternalMoveConstructFrom(Value&& that) {
       new (&map_value_) MapValue(std::move(that.map_value_));
       return;
     case Type::TAG:
-      NOTREACHED_IN_MIGRATION() << constants::kUnsupportedMajorType;
-      return;
+      NOTREACHED() << constants::kUnsupportedMajorType;
     case Type::SIMPLE_VALUE:
       simple_value_ = that.simple_value_;
       return;
@@ -289,7 +285,7 @@ void Value::InternalMoveConstructFrom(Value&& that) {
     case Type::NONE:
       return;
   }
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void Value::InternalCleanup() {
@@ -308,8 +304,7 @@ void Value::InternalCleanup() {
       map_value_.~MapValue();
       break;
     case Type::TAG:
-      NOTREACHED_IN_MIGRATION() << constants::kUnsupportedMajorType;
-      break;
+      NOTREACHED() << constants::kUnsupportedMajorType;
     case Type::NONE:
     case Type::UNSIGNED:
     case Type::NEGATIVE:

components/cbor/values.h

@@ -81,8 +81,7 @@ class CBOR_EXPORT Value {
           break;
       }
 
-      NOTREACHED_IN_MIGRATION();
-      return false;
+      NOTREACHED();
     }
 
     using is_transparent = void;

components/cbor/writer.cc

@@ -55,8 +55,7 @@ bool Writer::EncodeCBOR(const Value& node,
 
     case Value::Type::INVALID_UTF8: {
       if (!allow_invalid_utf8) {
-        NOTREACHED_IN_MIGRATION() << constants::kUnsupportedMajorType;
-        return false;
+        NOTREACHED() << constants::kUnsupportedMajorType;
       }
       // Encode a CBOR string with invalid UTF-8 data. This may produce invalid
       // CBOR and is reachable in tests only. See
@@ -128,8 +127,7 @@ bool Writer::EncodeCBOR(const Value& node,
     }
 
     case Value::Type::TAG:
-      NOTREACHED_IN_MIGRATION() << constants::kUnsupportedMajorType;
-      return false;
+      NOTREACHED() << constants::kUnsupportedMajorType;
 
     // Represents a simple value.
     case Value::Type::SIMPLE_VALUE: {
@@ -225,8 +223,7 @@ void Writer::SetUint(uint64_t value) {
       shift = 7;
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
   for (; shift >= 0; shift--) {
     encoded_cbor_->push_back(0xFF & (value >> (shift * 8)));

components/cdm/renderer/android_key_system_info.cc

@@ -61,8 +61,7 @@ bool AndroidKeySystemInfo::IsSupportedInitDataType(
     case EmeInitDataType::UNKNOWN:
       return false;
   }
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 EmeConfig::Rule AndroidKeySystemInfo::GetEncryptionSchemeConfigRule(

components/cdm/renderer/external_clear_key_key_system_info.cc

@@ -71,8 +71,7 @@ bool ExternalClearKeyKeySystemInfo::IsSupportedInitDataType(
     case media::EmeInitDataType::UNKNOWN:
       return false;
   }
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 std::optional<media::EmeConfig>
@@ -85,8 +84,7 @@ ExternalClearKeyKeySystemInfo::GetEncryptionSchemeConfigRule(
     case media::EncryptionScheme::kUnencrypted:
       break;
   }
-  NOTREACHED_IN_MIGRATION();
-  return media::EmeConfig::UnsupportedRule();
+  NOTREACHED();
 }
 
 media::SupportedCodecs ExternalClearKeyKeySystemInfo::GetSupportedCodecs()

components/chromeos_camera/common/jpeg_encode_accelerator_mojom_traits.cc

@@ -29,8 +29,7 @@ EnumTraits<chromeos_camera::mojom::EncodeStatus,
     case chromeos_camera::JpegEncodeAccelerator::PLATFORM_FAILURE:
       return chromeos_camera::mojom::EncodeStatus::PLATFORM_FAILURE;
   }
-  NOTREACHED_IN_MIGRATION();
-  return chromeos_camera::mojom::EncodeStatus::ENCODE_OK;
+  NOTREACHED();
 }
 
 // static
@@ -64,8 +63,7 @@ bool EnumTraits<chromeos_camera::mojom::EncodeStatus,
       *out = chromeos_camera::JpegEncodeAccelerator::Status::PLATFORM_FAILURE;
       return true;
   }
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 }  // namespace mojo

components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc

@@ -35,8 +35,7 @@ EnumTraits<chromeos_camera::mojom::DecodeError,
     case chromeos_camera::MjpegDecodeAccelerator::PLATFORM_FAILURE:
       return chromeos_camera::mojom::DecodeError::PLATFORM_FAILURE;
   }
-  NOTREACHED_IN_MIGRATION();
-  return chromeos_camera::mojom::DecodeError::NO_ERRORS;
+  NOTREACHED();
 }
 
 // static
@@ -64,8 +63,7 @@ bool EnumTraits<chromeos_camera::mojom::DecodeError,
       *out = chromeos_camera::MjpegDecodeAccelerator::Error::PLATFORM_FAILURE;
       return true;
   }
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 // static

components/cloud_devices/common/printer_description.cc

@@ -452,8 +452,7 @@ const gfx::Size& FindMediaSizeByType(MediaSize size_name) {
       return media.size_um;
     }
   }
-  NOTREACHED_IN_MIGRATION();
-  return kMediaDefinitions[0].size_um;
+  NOTREACHED();
 }
 
 const MediaDefinition* FindMediaBySize(const gfx::Size& size_um) {
@@ -474,8 +473,7 @@ std::string TypeToString(const T& names, IdType id) {
     if (id == name.id)
       return name.json_name;
   }
-  NOTREACHED_IN_MIGRATION();
-  return std::string();
+  NOTREACHED();
 }
 
 template <class T, class IdType>
@@ -570,8 +568,7 @@ bool RangeVendorCapability::IsValid() const {
       return true;
     }
   }
-  NOTREACHED_IN_MIGRATION() << "Bad range capability value type";
-  return false;
+  NOTREACHED() << "Bad range capability value type";
 }
 
 bool RangeVendorCapability::LoadFrom(const base::Value::Dict& dict) {
@@ -663,8 +660,7 @@ bool TypedValueVendorCapability::IsValid() const {
     case ValueType::STRING:
       return true;
   }
-  NOTREACHED_IN_MIGRATION() << "Bad typed value capability value type";
-  return false;
+  NOTREACHED() << "Bad typed value capability value type";
 }
 
 bool TypedValueVendorCapability::LoadFrom(const base::Value::Dict& dict) {
@@ -733,7 +729,7 @@ VendorCapability::VendorCapability(VendorCapability&& other)
           TypedValueVendorCapability(std::move(other.typed_value_capability_));
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 
@@ -755,7 +751,7 @@ void VendorCapability::InternalCleanup() {
       typed_value_capability_.~TypedValueVendorCapability();
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
   type_ = Type::NONE;
 }
@@ -775,7 +771,7 @@ bool VendorCapability::operator==(const VendorCapability& other) const {
     case Type::TYPED_VALUE:
       return typed_value_capability_ == other.typed_value_capability_;
   }
-  NOTREACHED_IN_MIGRATION() << "Bad vendor capability type";
+  NOTREACHED() << "Bad vendor capability type";
 }
 
 bool VendorCapability::IsValid() const {
@@ -791,8 +787,7 @@ bool VendorCapability::IsValid() const {
     case Type::TYPED_VALUE:
       return typed_value_capability_.IsValid();
   }
-  NOTREACHED_IN_MIGRATION() << "Bad vendor capability type";
-  return false;
+  NOTREACHED() << "Bad vendor capability type";
 }
 
 bool VendorCapability::LoadFrom(const base::Value::Dict& dict) {
@@ -833,8 +828,7 @@ bool VendorCapability::LoadFrom(const base::Value::Dict& dict) {
   switch (type_) {
     case Type::NONE:
     default:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case Type::RANGE:
       new (&range_capability_) RangeVendorCapability();
       return range_capability_.LoadFrom(*range_capability_value);
@@ -845,8 +839,6 @@ bool VendorCapability::LoadFrom(const base::Value::Dict& dict) {
       new (&typed_value_capability_) TypedValueVendorCapability();
       return typed_value_capability_.LoadFrom(*typed_value_capability_value);
   }
-
-  return false;
 }
 
 void VendorCapability::SaveTo(base::Value::Dict* dict) const {
@@ -857,8 +849,7 @@ void VendorCapability::SaveTo(base::Value::Dict* dict) const {
 
   switch (type_) {
     case Type::NONE:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case Type::RANGE: {
       base::Value::Dict range_capability_value;
       range_capability_.SaveTo(&range_capability_value);

components/commerce/core/metrics/metrics_utils.cc

@@ -172,8 +172,7 @@ void RecordShoppingActionUKM(ukm::SourceId ukm_source_id,
       ukm_builder.SetPriceTracked(true);
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
-      return;
+      NOTREACHED();
   }
   ukm_builder.Record(ukm::UkmRecorder::Get());
 }

components/commerce/core/shopping_service_test_base.cc

@@ -120,9 +120,7 @@ OptimizationGuideDecision MockOptGuideDecider::CanApplyOptimization(
     OptimizationType optimization_type,
     OptimizationMetadata* optimization_metadata) {
   // We don't use the synchronous API in the shopping service.
-  NOTREACHED_IN_MIGRATION();
-
-  return OptimizationGuideDecision::kUnknown;
+  NOTREACHED();
 }
 
 void MockOptGuideDecider::AddOnDemandShoppingResponse(

components/content_capture/android/test_support/content_capture_test_support_android.cc

@@ -29,8 +29,7 @@ blink::mojom::FaviconIconType ToType(std::string type) {
     return blink::mojom::FaviconIconType::kTouchIcon;
   else if (type == "touch precomposed icon")
     return blink::mojom::FaviconIconType::kTouchPrecomposedIcon;
-  NOTREACHED_IN_MIGRATION();
-  return blink::mojom::FaviconIconType::kInvalid;
+  NOTREACHED();
 }
 
 }  // namespace

components/content_capture/browser/onscreen_content_provider.cc

@@ -87,7 +87,7 @@ void OnscreenContentProvider::RemoveConsumer(ContentCaptureConsumer& consumer) {
       return;
     }
   }
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 ContentCaptureReceiver* OnscreenContentProvider::ContentCaptureReceiverForFrame(

components/content_settings/browser/page_specific_content_settings.cc

@@ -603,7 +603,7 @@ PageSpecificContentSettings::~PageSpecificContentSettings() {
         break;
       default:
         // Currently, only camera and mic permissions are supported.
-        NOTREACHED_IN_MIGRATION();
+        NOTREACHED();
     }
   }
 }
@@ -988,7 +988,7 @@ void PageSpecificContentSettings::OnTwoSitePermissionChanged(
       break;
     }
     default:
-      NOTREACHED_IN_MIGRATION() << content_setting;
+      NOTREACHED() << content_setting;
   }
 
   if (access_changed) {

components/content_settings/core/browser/content_settings_default_provider.cc

@@ -246,8 +246,7 @@ std::unique_ptr<RuleIterator> DefaultProvider::GetRuleIterator(
   base::AutoLock lock(lock_);
   const auto it = default_settings_.find(content_type);
   if (it == default_settings_.end()) {
-    NOTREACHED_IN_MIGRATION();
-    return nullptr;
+    NOTREACHED();
   }
   return std::make_unique<DefaultRuleIterator>(it->second.Clone());
 }
@@ -266,8 +265,7 @@ std::unique_ptr<Rule> DefaultProvider::GetRule(
   base::AutoLock lock(lock_);
   const auto it = default_settings_.find(content_type);
   if (it == default_settings_.end()) {
-    NOTREACHED_IN_MIGRATION();
-    return nullptr;
+    NOTREACHED();
   }
 
   if (it->second.is_none()) {
@@ -349,10 +347,9 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) {
   }
 
   if (content_type == ContentSettingsType::DEFAULT) {
-    NOTREACHED_IN_MIGRATION() << "A change of the preference " << name
-                              << " was observed, but the preference could not "
-                                 "be mapped to a content settings type.";
-    return;
+    NOTREACHED() << "A change of the preference " << name
+                 << " was observed, but the preference could not be mapped to "
+                    "a content settings type.";
   }
 
   {

components/content_settings/core/browser/content_settings_policy_provider.cc

@@ -410,17 +410,14 @@ void PolicyProvider::GetContentSettingsFromPreferences() {
     DCHECK(!pref->HasExtensionSetting());
 
     if (!pref->GetValue()->is_list()) {
-      NOTREACHED_IN_MIGRATION()
-          << "Could not read patterns from " << entry.pref_name;
-      return;
+      NOTREACHED() << "Could not read patterns from " << entry.pref_name;
     }
 
     const base::Value::List& pattern_str_list = pref->GetValue()->GetList();
     for (size_t i = 0; i < pattern_str_list.size(); ++i) {
       if (!pattern_str_list[i].is_string()) {
-        NOTREACHED_IN_MIGRATION() << "Could not read content settings pattern #"
-                                  << i << " from " << entry.pref_name;
-        continue;
+        NOTREACHED() << "Could not read content settings pattern #" << i
+                     << " from " << entry.pref_name;
       }
 
       const std::string& original_pattern_str = pattern_str_list[i].GetString();
@@ -474,8 +471,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences() {
   DCHECK(!pref->HasExtensionSetting());
 
   if (!pref->GetValue()->is_list()) {
-    NOTREACHED_IN_MIGRATION();
-    return;
+    NOTREACHED();
   }
 
   // Parse the list of pattern filter strings. A pattern filter string has
@@ -498,8 +494,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences() {
   std::unordered_map<std::string, base::Value::Dict> filters_map;
   for (const auto& pattern_filter_str : pref->GetValue()->GetList()) {
     if (!pattern_filter_str.is_string()) {
-      NOTREACHED_IN_MIGRATION();
-      continue;
+      NOTREACHED();
     }
 
     std::optional<base::Value> pattern_filter = base::JSONReader::Read(

components/content_settings/core/browser/content_settings_uma_util.cc

@@ -190,8 +190,7 @@ std::string GetProviderNameForHistograms(
     case ProviderType::kOtherProviderForTests:
       return "OtherProviderForTests";
     case ProviderType::kNone:
-      NOTREACHED_IN_MIGRATION();
-      return "";
+      NOTREACHED();
   }
 }
 
@@ -219,8 +218,7 @@ int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
         << "Used for deprecated settings: " << static_cast<int>(found->first);
     return found->second;
   }
-  NOTREACHED_IN_MIGRATION();
-  return -1;
+  NOTREACHED();
 }
 
 void RecordActiveExpiryEvent(content_settings::ProviderType provider_type,

components/content_settings/core/browser/content_settings_utils.cc

@@ -149,8 +149,7 @@ bool IsMorePermissive(ContentSetting a, ContentSetting b) {
     if (setting == a)
       return true;
   }
-  NOTREACHED_IN_MIGRATION();
-  return true;
+  NOTREACHED();
 }
 
 // Currently only mojom::SessionModel::DURABLE constraints need to be persistent

components/content_settings/core/browser/host_content_settings_map.cc

@@ -251,8 +251,7 @@ const char* ContentSettingToString(ContentSetting setting) {
       return "DetectImportantContent";
     case CONTENT_SETTING_DEFAULT:
     case CONTENT_SETTING_NUM_SETTINGS:
-      NOTREACHED_IN_MIGRATION();
-      return nullptr;
+      NOTREACHED();
   }
 }
 
@@ -529,7 +528,7 @@ void HostContentSettingsMap::SetWebsiteSettingCustomScope(
     DCHECK_EQ(value, clone);
 #endif
   }
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 bool HostContentSettingsMap::CanSetNarrowestContentSetting(
@@ -1282,7 +1281,7 @@ void HostContentSettingsMap::DeleteNearlyExpiredSettingsAndMaybeScheduleNextRun(
     } else {
       // For non-modifiable providers there exists no expiry method and
       // SetWebsiteSettingCustomScope cannot work.
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
     }
   }
 

components/content_settings/core/browser/private_network_settings.cc

@@ -42,10 +42,9 @@ bool ShouldAllowInsecurePrivateNetworkRequests(
     case CONTENT_SETTING_BLOCK:
       return false;
     default:
-      NOTREACHED_IN_MIGRATION()
+      NOTREACHED()
           << "Invalid content setting for insecure private network requests: "
           << setting;
-      return false;
   }
 }
 

components/content_settings/core/common/content_settings_mojom_traits.cc

@@ -51,8 +51,7 @@ EnumTraits<content_settings::mojom::ContentSetting, ContentSetting>::ToMojom(
       // CONTENT_SETTING_NUM_SETTINGS is a dummy enum value.
       break;
   }
-  NOTREACHED_IN_MIGRATION();
-  return content_settings::mojom::ContentSetting::DEFAULT;
+  NOTREACHED();
 }
 
 // static

components/content_settings/core/common/content_settings_pattern.cc

@@ -312,8 +312,7 @@ bool ContentSettingsPattern::Builder::Validate(const PatternParts& parts) {
   if ((parts.is_scheme_wildcard && !parts.scheme.empty()) ||
       (parts.is_port_wildcard && !parts.port.empty()) ||
       (parts.is_path_wildcard && !parts.path.empty())) {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   // file:// URL patterns have an empty host and port.
@@ -890,8 +889,7 @@ ContentSettingsPattern::Relation ContentSettingsPattern::CompareHost(
     return ContentSettingsPattern::DISJOINT_ORDER_POST;
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return ContentSettingsPattern::IDENTITY;
+  NOTREACHED();
 }
 
 // static

components/content_settings/core/common/content_settings_pattern_parser.cc

@@ -103,7 +103,7 @@ void PatternParser::Parse(std::string_view pattern_spec,
       start = current_pos;
     }
   } else {
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 
   current_pos = pattern_spec.size();

components/content_settings/core/common/cookie_settings_base.cc

@@ -379,9 +379,8 @@ CookieSettingsBase::GetCookieAccessSemanticsForDomain(
     case CONTENT_SETTING_BLOCK:
       return net::CookieAccessSemantics::NONLEGACY;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
-  return net::CookieAccessSemantics::UNKNOWN;
 }
 
 bool CookieSettingsBase::ShouldConsiderMitigationsFor3pcd(

components/content_settings/core/common/cookie_settings_base_unittest.cc

@@ -91,8 +91,7 @@ class CallbackCookieSettings : public CookieSettingsBase {
   bool ShouldIgnoreSameSiteRestrictions(
       const GURL& url,
       const net::SiteForCookies& site_for_cookies) const override {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
  private:

components/content_settings/core/common/host_indexed_content_settings.cc

@@ -182,7 +182,7 @@ HostIndexedContentSettings::Iterator::operator++() {
         // We have reached the end.
         break;
       case Stage::kInvalid:
-        NOTREACHED_IN_MIGRATION();
+        NOTREACHED();
     }
   }
   return *this;
@@ -229,7 +229,7 @@ void HostIndexedContentSettings::Iterator::SetStage(Stage stage) {
       current_end_ = index_->wildcard_settings_.end();
       break;
     case Stage::kInvalid:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 

components/content_settings/renderer/content_settings_agent_impl.cc

@@ -146,8 +146,7 @@ ContentSetting GetContentSettingFromRules(
       return rule.GetContentSetting();
     }
   }
-  NOTREACHED_IN_MIGRATION();
-  return CONTENT_SETTING_DEFAULT;
+  NOTREACHED();
 }
 }  // namespace
 

components/crash/content/browser/crash_handler_host_linux.cc

@@ -164,7 +164,7 @@ void CrashHandlerHostLinux::Init() {
 }
 
 void CrashHandlerHostLinux::OnFileCanWriteWithoutBlocking(int fd) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) {
@@ -637,7 +637,7 @@ void CrashHandlerHost::NotifyCrashSignalObservers(base::ProcessId pid,
 }
 
 void CrashHandlerHost::OnFileCanWriteWithoutBlocking(int fd) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 void CrashHandlerHost::OnFileCanReadWithoutBlocking(int fd) {

components/crash/core/app/fallback_crash_handler_launcher_win.cc

@@ -115,15 +115,13 @@ DWORD FallbackCrashHandlerLauncher::LaunchAndWaitForHandler(
   if (error != WAIT_OBJECT_0) {
     // This should never happen, barring handle abuse.
     // TODO(siggi): Record an UMA metric here.
-    NOTREACHED_IN_MIGRATION();
-    error = GetLastError();
+    NOTREACHED();
   } else {
     // On successful wait, return the exit code of the fallback crash handler
     // process.
     if (!GetExitCodeProcess(process_info.hProcess, &error)) {
       // This should never happen, barring handle abuse.
-      NOTREACHED_IN_MIGRATION();
-      error = GetLastError();
+      NOTREACHED();
     }
   }
 

components/crash/core/app/fallback_crash_handling_win.cc

@@ -58,16 +58,14 @@ bool SetupFallbackCrashHandling(const base::CommandLine& command_line) {
   // Get the database path.
   base::FilePath database_path = command_line.GetSwitchValuePath("database");
   if (database_path.empty()) {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   std::unique_ptr<FallbackCrashHandlerLauncher> fallback_launcher(
       new FallbackCrashHandlerLauncher());
 
   if (!fallback_launcher->Initialize(base_command_line, database_path)) {
-    NOTREACHED_IN_MIGRATION();
-    return false;
+    NOTREACHED();
   }
 
   // This is necessary because chrome_elf stubs out the

components/crash/core/browser/crash_upload_list_crashpad.cc

@@ -25,8 +25,7 @@ UploadList::UploadInfo::State ReportUploadStateToUploadInfoState(
       return UploadList::UploadInfo::State::Uploaded;
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return UploadList::UploadInfo::State::Uploaded;
+  NOTREACHED();
 }
 
 }  // namespace

components/crash/core/browser/crashes_ui_util.cc

@@ -65,8 +65,7 @@ std::string UploadInfoStateAsString(UploadList::UploadInfo::State state) {
       return "uploaded";
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return "";
+  NOTREACHED();
 }
 
 void UploadListToValue(UploadList* upload_list, base::Value::List* out_value) {

components/crash/core/common/objc_zombie.mm

@@ -388,12 +388,7 @@ bool ZombieEnable(bool zombieAllObjects,
       g_zombies =
           static_cast<ZombieRecord*>(calloc(g_zombieCount, sizeof(*g_zombies)));
       if (!g_zombies) {
-        NOTREACHED_IN_MIGRATION();
-        g_zombies = oldZombies;
-        g_zombieCount = oldCount;
-        g_zombieIndex = oldIndex;
-        ZombieDisable();
-        return false;
+        NOTREACHED();
       }
     }
 

components/cronet/native/test/url_request_test.cc

@@ -444,7 +444,7 @@ class UrlRequestTest : public ::testing::TestWithParam<
             engine, request_finished_listener_, executor);
         break;
       default:
-        NOTREACHED_IN_MIGRATION();
+        NOTREACHED();
     }
   }
 

components/cronet/stale_host_resolver.cc

@@ -130,8 +130,8 @@ int StaleHostResolver::RequestImpl::Start(
   cache_parameters.source = net::HostResolverSource::LOCAL_ONLY;
   cache_request_ = resolver_->inner_resolver_->CreateRequest(
       host_, network_anonymization_key_, net_log_, cache_parameters);
-  int error = cache_request_->Start(
-      base::BindOnce([](int error) { NOTREACHED_IN_MIGRATION(); }));
+  int error =
+      cache_request_->Start(base::BindOnce([](int error) { NOTREACHED(); }));
   DCHECK_NE(net::ERR_IO_PENDING, error);
   cache_error_ = cache_request_->GetResolveErrorInfo().error;
   DCHECK_NE(net::ERR_IO_PENDING, cache_error_);

components/cronet/url_request_context_config_unittest.cc

@@ -293,8 +293,8 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
       context->host_resolver()->CreateRequest(
           net::HostPortPair("abcde", 80), net::NetworkAnonymizationKey(),
           net::NetLogWithSource(), std::nullopt);
-  EXPECT_EQ(net::OK, resolve_request->Start(base::BindOnce(
-                         [](int error) { NOTREACHED_IN_MIGRATION(); })));
+  EXPECT_EQ(net::OK, resolve_request->Start(
+                         base::BindOnce([](int error) { NOTREACHED(); })));
 
   EXPECT_TRUE(config->network_thread_priority);
   EXPECT_EQ(42, config->network_thread_priority.value());

components/desks_storage/core/desk_template_conversion.cc

@@ -289,8 +289,7 @@ GroupColor ConvertGroupColorStringToGroupColor(const std::string& group_color) {
   } else if (group_color == tab_groups::kTabGroupColorUnknown) {
     return GroupColor::kGrey;
   } else {
-    NOTREACHED_IN_MIGRATION();
-    return GroupColor::kGrey;
+    NOTREACHED();
   }
 }
 
@@ -1277,8 +1276,7 @@ std::unique_ptr<app_restore::AppLaunchInfo> ConvertToAppLaunchInfo(
     case sync_pb::WorkspaceDeskSpecifics_AppOneOf::AppCase::APP_NOT_SET:
       // This should never happen. `APP_NOT_SET` corresponds to empty `app_id`.
       // This method will early return when `app_id` is empty.
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
     case sync_pb::WorkspaceDeskSpecifics_AppOneOf::AppCase::kBrowserAppWindow:
       if (app.app().browser_app_window().has_active_tab_index()) {
         app_launch_info->browser_extra_info.active_tab_index =
@@ -1472,8 +1470,7 @@ SyncTabGroupColor SyncTabColorFromTabGroupColorId(
     case TabGroupColor::kOrange:
       return SyncTabGroupColor::WorkspaceDeskSpecifics_TabGroupColor_ORANGE;
     case TabGroupColor::kNumEntries:
-      NOTREACHED_IN_MIGRATION() << "kNumEntries is not a supported color enum.";
-      return SyncTabGroupColor::WorkspaceDeskSpecifics_TabGroupColor_GREY;
+      NOTREACHED() << "kNumEntries is not a supported color enum.";
   };
 }
 
@@ -1740,9 +1737,7 @@ bool FillApp(const std::string& app_id,
       } else {
         // Chrome app running in Lacros should have
         // AppType::kStandaloneBrowserChromeApp and never reach here.
-        NOTREACHED_IN_MIGRATION();
-        // Ignore this app type.
-        return false;
+        NOTREACHED();
       }
 
       break;
@@ -2114,8 +2109,7 @@ std::string ConvertTabGroupColorIdToString(GroupColor color) {
     case GroupColor::kOrange:
       return tab_groups::kTabGroupColorOrange;
     case GroupColor::kNumEntries:
-      NOTREACHED_IN_MIGRATION() << "kNumEntries is not a supported color enum.";
-      return tab_groups::kTabGroupColorGrey;
+      NOTREACHED() << "kNumEntries is not a supported color enum.";
   }
 }
 

components/device_event_log/device_event_log_impl.cc

@@ -94,8 +94,7 @@ std::string GetLogTypeString(LogType type) {
     case LOG_TYPE_UNKNOWN:
       break;
   }
-  NOTREACHED_IN_MIGRATION();
-  return "Unknown";
+  NOTREACHED();
 }
 
 LogType GetLogTypeFromString(std::string_view desc) {
@@ -106,8 +105,7 @@ LogType GetLogTypeFromString(std::string_view desc) {
     if (desc_lc == log_desc_lc)
       return type;
   }
-  NOTREACHED_IN_MIGRATION() << "Unrecogized LogType: " << desc;
-  return LOG_TYPE_UNKNOWN;
+  NOTREACHED() << "Unrecogized LogType: " << desc;
 }
 
 std::string DateAndTimeWithMicroseconds(const base::Time& time) {

components/device_signals/core/browser/crowdstrike_client.cc

@@ -149,8 +149,7 @@ std::unique_ptr<CrowdStrikeClient> CrowdStrikeClient::Create() {
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
   return std::make_unique<CrowdStrikeClientImpl>(GetCrowdStrikeZtaFilePath());
 #else
-  NOTREACHED_IN_MIGRATION();
-  return nullptr;
+  NOTREACHED();
 #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 }
 

components/device_signals/core/browser/signals_aggregator_impl.cc

@@ -33,8 +33,7 @@ SignalCollectionError PermissionToError(const UserPermission permission) {
     case UserPermission::kMissingUser:
       return SignalCollectionError::kInvalidUser;
     case UserPermission::kGranted:
-      NOTREACHED_IN_MIGRATION();
-      ABSL_FALLTHROUGH_INTENDED;
+      NOTREACHED();
     case UserPermission::kUnsupported:
       return SignalCollectionError::kUnsupported;
   }

components/discardable_memory/client/client_discardable_shared_memory_manager.cc

@@ -499,8 +499,7 @@ bool ClientDiscardableSharedMemoryManager::LockSpan(
       return false;
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return false;
+  NOTREACHED();
 }
 
 void ClientDiscardableSharedMemoryManager::UnlockSpan(

components/dom_distiller/core/distiller_page.cc

@@ -44,7 +44,7 @@ std::string GetDistillerScriptWithOptions(
       dom_distiller::proto::json::DomDistillerOptions::WriteToValue(options);
   std::string options_json;
   if (!base::JSONWriter::Write(options_value, &options_json)) {
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
   size_t options_offset = script.find(kOptionsPlaceholder);
   DCHECK_NE(std::string::npos, options_offset);

components/dom_distiller/core/experiments.cc

@@ -34,8 +34,7 @@ DistillerHeuristicsType GetDistillerHeuristicsType() {
     if (switch_value == switches::reader_mode_heuristics::kNone) {
       return DistillerHeuristicsType::NONE;
     }
-    NOTREACHED_IN_MIGRATION()
-        << "Invalid value for " << switches::kReaderModeHeuristics;
+    NOTREACHED() << "Invalid value for " << switches::kReaderModeHeuristics;
   } else {
     if (base::StartsWith(group_name, "AdaBoost",
                          base::CompareCase::INSENSITIVE_ASCII)) {

components/dom_distiller/ios/distiller_page_ios.mm

@@ -99,7 +99,7 @@ base::Value ConvertedResultFromScriptResult(const base::Value* value,
     result = base::Value(std::move(list));
     DCHECK_EQ(result.type(), base::Value::Type::LIST);
   } else {
-    NOTREACHED_IN_MIGRATION();  // Convert other types as needed.
+    NOTREACHED();  // Convert other types as needed.
   }
   return result;
 }
@@ -272,7 +272,7 @@ void DistillerPageIOS::WebStateDestroyed(web::WebState* web_state) {
   // The DistillerPageIOS owns the WebState that it observe and unregister
   // itself from the WebState before destroying it, so this method should
   // never be called.
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 }  // namespace dom_distiller

components/domain_reliability/monitor.cc

@@ -159,7 +159,7 @@ void DomainReliabilityMonitor::ClearBrowsingData(
       context_manager_.RemoveContexts(origin_filter);
       break;
     case MAX_CLEAR_MODE:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 }
 

components/domain_reliability/uploader.cc

@@ -207,7 +207,7 @@ class DomainReliabilityUploaderImpl : public DomainReliabilityUploader,
   // Requests are cancelled in OnResponseStarted() once response headers are
   // read, without reading the body, so this is not needed.
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override {
-    NOTREACHED_IN_MIGRATION();
+    NOTREACHED();
   }
 
  private:

components/domain_reliability/util.cc

@@ -121,8 +121,7 @@ std::string GetDomainReliabilityProtocol(
     case net::HttpConnectionInfoCoarse::kOTHER:
       return "";
   }
-  NOTREACHED_IN_MIGRATION();
-  return "";
+  NOTREACHED();
 }
 
 DomainReliabilityUploader::UploadResult GetUploadResultFromResponseDetails(

components/drive/drive_notification_manager.cc

@@ -307,8 +307,7 @@ std::string DriveNotificationManager::NotificationSourceToString(
       return "NOTIFICATION_POLLING";
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return "";
+  NOTREACHED();
 }
 
 invalidation::Topic DriveNotificationManager::GetDriveInvalidationTopic()

components/drive/drive_uploader_unittest.cc

@@ -327,8 +327,7 @@ class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
                                   const base::FilePath& local_file_path,
                                   UploadRangeCallback callback,
                                   ProgressCallback progress_callback) override {
-    NOTREACHED_IN_MIGRATION();
-    return CancelCallbackOnce();
+    NOTREACHED();
   }
 
   CancelCallbackOnce MultipartUploadNewFile(

components/drive/file_errors.cc

@@ -49,10 +49,8 @@ std::string FileErrorToString(FileError error) {
 #undef PRINT
   }
 
-  NOTREACHED_IN_MIGRATION()
-      << "Unexpected FileError "
-      << static_cast<std::underlying_type_t<FileError>>(error);
-  return "";
+  NOTREACHED() << "Unexpected FileError "
+               << static_cast<std::underlying_type_t<FileError>>(error);
 }
 
 bool IsFileErrorOk(FileError error) {
@@ -145,8 +143,7 @@ base::File::Error FileErrorToBaseFileError(FileError error) {
       return base::File::FILE_ERROR_FAILED;
   }
 
-  NOTREACHED_IN_MIGRATION();
-  return base::File::FILE_ERROR_FAILED;
+  NOTREACHED();
 }
 
 FileError GDataToFileError(google_apis::ApiErrorCode status) {

components/drive/service/fake_drive_service.cc

@@ -198,8 +198,7 @@ std::string GetTeamDriveId(const google_apis::ChangeResource& change_resource) {
       team_drive_id = change_resource.team_drive_id();
       break;
     case ChangeResource::UNKNOWN:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
   return team_drive_id;
 }
@@ -1793,8 +1792,7 @@ void FakeDriveService::GetChangeListInternal(
         }
         break;
       case ChangeResource::UNKNOWN:
-        NOTREACHED_IN_MIGRATION();
-        break;
+        NOTREACHED();
     }
 
     // If |start_changestamp| is set, exclude the entry if the
@@ -1902,16 +1900,14 @@ CancelCallbackOnce FakeDriveService::AddPermission(
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(callback);
 
-  NOTREACHED_IN_MIGRATION();
-  return CancelCallbackOnce();
+  NOTREACHED();
 }
 
 std::unique_ptr<BatchRequestConfiguratorInterface>
 FakeDriveService::StartBatchRequest() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  NOTREACHED_IN_MIGRATION();
-  return nullptr;
+  NOTREACHED();
 }
 
 void FakeDriveService::NotifyObservers() {

components/embedder_support/android/delegate/web_contents_delegate_android.cc

@@ -267,7 +267,7 @@ bool WebContentsDelegateAndroid::DidAddMessageToConsole(
       jlevel = WEB_CONTENTS_DELEGATE_LOG_LEVEL_ERROR;
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
   return Java_WebContentsDelegateAndroid_addMessageToConsole(
       env, GetJavaDelegate(env), jlevel, jmessage, line_no, jsource_id);

components/embedder_support/ios/delegate/file_chooser/file_select_helper_ios.mm

@@ -142,9 +142,7 @@ void FileSelectHelperIOS::RunFileChooser(
       dialog_type_ = ui::SelectFileDialog::SELECT_SAVEAS_FILE;
       break;
     default:
-      // Prevent warning.
-      dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
   }
 
   gfx::NativeWindow owning_window = web_contents_->GetTopLevelNativeWindow();

components/embedder_support/user_agent_utils.cc

@@ -92,8 +92,7 @@ int GetPreRS5UniversalApiContractVersion() {
   }
   // The list above should account for all Windows versions prior to
   // RS5.
-  NOTREACHED_IN_MIGRATION();
-  return 0;
+  NOTREACHED();
 }
 
 // Returns the UniversalApiContract version number, which is available for

components/enterprise/browser/controller/chrome_browser_cloud_management_controller.cc

@@ -53,7 +53,7 @@ ChromeBrowserCloudManagementController::Delegate::
 
 void ChromeBrowserCloudManagementController::Delegate::DeferInitialization(
     base::OnceClosure callback) {
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 }
 
 ChromeBrowserCloudManagementController::ChromeBrowserCloudManagementController(

components/enterprise/browser/reporting/browser_report_generator.cc

@@ -73,8 +73,7 @@ void BrowserReportGenerator::GenerateBasicInfo(em::BrowserReport* report,
           ObfuscateFilePath(delegate_->GetExecutablePath()));
       break;
     case ReportType::kBrowserVersion:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
 }
 

components/enterprise/browser/reporting/policy_info.cc

@@ -30,9 +30,8 @@ em::Policy_PolicyLevel GetLevel(const base::Value& policy) {
     case policy::POLICY_LEVEL_MANDATORY:
       return em::Policy_PolicyLevel_LEVEL_MANDATORY;
   }
-  NOTREACHED_IN_MIGRATION()
-      << "Invalid policy level: " << *policy.GetDict().FindInt("level");
-  return em::Policy_PolicyLevel_LEVEL_UNKNOWN;
+  NOTREACHED() << "Invalid policy level: "
+               << *policy.GetDict().FindInt("level");
 }
 
 em::Policy_PolicyScope GetScope(const base::Value& policy) {
@@ -43,9 +42,8 @@ em::Policy_PolicyScope GetScope(const base::Value& policy) {
     case policy::POLICY_SCOPE_MACHINE:
       return em::Policy_PolicyScope_SCOPE_MACHINE;
   }
-  NOTREACHED_IN_MIGRATION()
-      << "Invalid policy scope: " << *policy.GetDict().FindInt("scope");
-  return em::Policy_PolicyScope_SCOPE_UNKNOWN;
+  NOTREACHED() << "Invalid policy scope: "
+               << *policy.GetDict().FindInt("scope");
 }
 
 em::Policy_PolicySource GetSource(const base::Value& policy) {
@@ -74,12 +72,10 @@ em::Policy_PolicySource GetSource(const base::Value& policy) {
       return em::
           Policy_PolicySource_SOURCE_RESTRICTED_MANAGED_GUEST_SESSION_OVERRIDE;
     case policy::POLICY_SOURCE_COUNT:
-      NOTREACHED_IN_MIGRATION();
-      return em::Policy_PolicySource_SOURCE_UNKNOWN;
+      NOTREACHED();
   }
-  NOTREACHED_IN_MIGRATION()
-      << "Invalid policy source: " << *policy.GetDict().FindInt("source");
-  return em::Policy_PolicySource_SOURCE_UNKNOWN;
+  NOTREACHED() << "Invalid policy source: "
+               << *policy.GetDict().FindInt("source");
 }
 
 void UpdateConflictedPolicy(em::Policy* policy_info,

components/enterprise/browser/reporting/profile_report_generator.cc

@@ -62,8 +62,7 @@ ProfileReportGenerator::MaybeGenerate(const base::FilePath& path,
       report_->set_id(ObfuscateFilePath(path.AsUTF8Unsafe()));
       break;
     case ReportType::kBrowserVersion:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
 
   report_->set_name(name);

components/enterprise/browser/reporting/real_time_uploader.cc

@@ -42,8 +42,7 @@ void RealTimeUploader::Upload(
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   if (!report_queue_) {
-    NOTREACHED_IN_MIGRATION();
-    return;
+    NOTREACHED();
   }
 
   report_queue_->Enqueue(
@@ -86,7 +85,7 @@ void RealTimeUploader::CreateReportQueue(const std::string& dm_token,
   }
   report_queue_ = std::move(report_queue.value());
 #else
-  NOTREACHED_IN_MIGRATION();
+  NOTREACHED();
 #endif  // !BUILDFLAG(IS_IOS)
 }
 

components/enterprise/browser/reporting/report_scheduler.cc

@@ -205,8 +205,7 @@ bool ReportScheduler::SetupBrowserPolicyClientRegistration() {
 #if !BUILDFLAG(IS_CHROMEOS_ASH)
     client_id = policy::BrowserDMTokenStorage::Get()->RetrieveClientId();
 #else
-    NOTREACHED_IN_MIGRATION();
-    return true;
+    NOTREACHED();
 #endif
   }
   if (!dm_token.is_valid() || client_id.empty()) {
@@ -393,8 +392,7 @@ ReportType ReportScheduler::TriggerToReportType(
     ReportScheduler::ReportTrigger trigger) {
   switch (trigger) {
     case ReportScheduler::kTriggerNone:
-      NOTREACHED_IN_MIGRATION();
-      [[fallthrough]];
+      NOTREACHED();
     case ReportScheduler::kTriggerTimer:
     case ReportScheduler::kTriggerManual:
       return full_report_type_;

components/enterprise/client_certificates/core/scoped_ssl_key_converter.cc

@@ -30,7 +30,7 @@ class StubSSLKeyConverter : public SSLKeyConverter {
     if (!supports_unexportable_) {
       // If unexportable keys are not supported, then there shouldn't be an
       // unexportable key instance to convert.
-      NOTREACHED_IN_MIGRATION();
+      NOTREACHED();
     }
 
     // In this case, the underlying unexportable key is effectively a stub

components/enterprise/connectors/core/common.cc

@@ -59,8 +59,7 @@ const char* AnalysisConnectorPref(AnalysisConnector connector) {
       return kOnFileTransferPref;
 #endif
     case AnalysisConnector::ANALYSIS_CONNECTOR_UNSPECIFIED:
-      NOTREACHED_IN_MIGRATION() << "Using unspecified analysis connector";
-      return "";
+      NOTREACHED() << "Using unspecified analysis connector";
   }
 }
 
@@ -79,8 +78,7 @@ const char* AnalysisConnectorScopePref(AnalysisConnector connector) {
       return kOnFileTransferScopePref;
 #endif
     case AnalysisConnector::ANALYSIS_CONNECTOR_UNSPECIFIED:
-      NOTREACHED_IN_MIGRATION() << "Using unspecified analysis connector";
-      return "";
+      NOTREACHED() << "Using unspecified analysis connector";
   }
 }
 
@@ -128,8 +126,7 @@ TriggeredRule::Action GetHighestPrecedenceAction(
       action_2 == TriggeredRule::ACTION_UNSPECIFIED) {
     return TriggeredRule::ACTION_UNSPECIFIED;
   }
-  NOTREACHED_IN_MIGRATION();
-  return TriggeredRule::ACTION_UNSPECIFIED;
+  NOTREACHED();
 }
 
 ContentAnalysisAcknowledgement::FinalAction GetHighestPrecedenceAction(
@@ -159,8 +156,7 @@ ContentAnalysisAcknowledgement::FinalAction GetHighestPrecedenceAction(
       action_2 == ContentAnalysisAcknowledgement::ACTION_UNSPECIFIED) {
     return ContentAnalysisAcknowledgement::ACTION_UNSPECIFIED;
   }
-  NOTREACHED_IN_MIGRATION();
-  return ContentAnalysisAcknowledgement::ACTION_UNSPECIFIED;
+  NOTREACHED();
 }
 
 FileMetadata::FileMetadata(const std::string& filename,
@@ -322,8 +318,7 @@ DataRegion ChromeDataRegionSettingToEnum(int chrome_data_region_setting) {
     case 2:
       return DataRegion::EUROPE;
   }
-  NOTREACHED_IN_MIGRATION();
-  return DataRegion::NO_PREFERENCE;
+  NOTREACHED();
 }
 
 EnterpriseReportingEventType GetUmaEnumFromEventName(

components/enterprise/data_controls/core/browser/rule.cc

@@ -516,8 +516,7 @@ bool Rule::AddUnsupportedAttributeErrors(
     if (!kSupportedAttributes.contains(restriction.first)) {
       // This shouldn't be reached as `AddUnsupportedRestrictionErrors` should
       // catch these unsupported restrictions.
-      NOTREACHED_IN_MIGRATION();
-      continue;
+      NOTREACHED();
     }
 
     for (const auto& attribute : anyof_conditions) {

components/error_page/common/localized_error.cc

@@ -610,8 +610,7 @@ void AddLinkedSuggestionToList(const int error_code,
           IDS_ERRORPAGES_SUGGESTION_DELETE_COOKIES_SUMMARY);
       break;
     default:
-      NOTREACHED_IN_MIGRATION();
-      break;
+      NOTREACHED();
   }
 
   DCHECK(learn_more_url.is_valid());

components/error_page/common/net_error_info.cc

@@ -28,8 +28,7 @@ const char* DnsProbeStatusToString(int status) {
     case DNS_PROBE_FINISHED_BAD_SECURE_CONFIG:
       return "DNS_PROBE_FINISHED_BAD_SECURE_CONFIG";
     default:
-      NOTREACHED_IN_MIGRATION();
-      return "";
+      NOTREACHED();
   }
 }