Migrate NOTREACHED_NORETURN -> NOTREACHED

NOTREACHED() has turned [[noreturn]] so the former macro isn't needed
anymore.

This does not attempt to do a rewrite 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.

NO_IFTTT=No-op-rename migration.

Bug: 40580068
Change-Id: I068c5fdce9dc4c352d8bdd62bb3cd2c0a2d59659
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5782602
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1342096}

android_webview/browser/aw_browser_context_store.cc

@@ -154,7 +154,7 @@ AwBrowserContextStore::DeletionResult AwBrowserContextStore::Delete(
       return DeletionResult::kDeleted;
     }
   }
-  NOTREACHED_NORETURN() << "Profile exists in memory but not in prefs";
+  NOTREACHED() << "Profile exists in memory but not in prefs";
 }
 
 base::FilePath AwBrowserContextStore::GetRelativePathForTesting(

android_webview/browser/aw_content_browser_client.cc

@@ -1337,7 +1337,7 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
     }
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 content::ContentBrowserClient::AttributionReportingOsRegistrars
@@ -1385,7 +1385,7 @@ AwContentBrowserClient::GetAttributionReportingOsRegistrars(
               AttributionReportingOsRegistrar::kDisabled};
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 network::mojom::IpProtectionProxyBypassPolicy

android_webview/js_sandbox/service/js_sandbox_isolate.cc

@@ -196,7 +196,7 @@ jint remapConsoleMessageErrorLevel(const v8::Isolate::MessageErrorLevel level) {
     case v8::Isolate::MessageErrorLevel::kMessageWarning:
       return 1 << 4;
     case v8::Isolate::MessageErrorLevel::kMessageAll:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/accelerators/accelerator_alias_converter.cc

@@ -232,7 +232,7 @@ ui::mojom::SixPackShortcutModifier GetSixPackShortcutModifier(
     case ui::VKEY_NEXT:
       return settings->six_pack_key_remappings->page_down;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/accelerators/keyboard_code_util.cc

@@ -160,7 +160,7 @@ const gfx::VectorIcon* GetSearchOrLauncherVectorIcon() {
       return &kCampbellHeroIcon;
     case ui::mojom::MetaKey::kExternalMeta:
     case ui::mojom::MetaKey::kCommand:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/ambient/ambient_photo_cache.cc

@@ -141,7 +141,7 @@ const base::FilePath& GetCacheRootDir(ambient_photo_cache::Store store) {
     case ambient_photo_cache::Store::kBackup:
       return GetAmbientBackupPhotoCacheRootDir();
   }
-  NOTREACHED_NORETURN() << "Unknown cache store: " << static_cast<int>(store);
+  NOTREACHED() << "Unknown cache store: " << static_cast<int>(store);
 }
 
 base::FilePath GetCachePath(int cache_index, const base::FilePath& root_path) {

ash/app_list/app_list_metrics.cc

@@ -138,7 +138,7 @@ std::string GetCategoryString(AppListSearchControlCategory category) {
     case AppListSearchControlCategory::kWeb:
       return "Web";
     case AppListSearchControlCategory::kCannotToggle:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/app_list/views/app_list_menu_model_adapter.cc

@@ -109,7 +109,7 @@ void AppListMenuModelAdapter::RecordHistogramOnMenuClosed() {
       }
       break;
     case APP_LIST_APP_TYPE_LAST:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/app_list/views/search_box_view.cc

@@ -236,7 +236,7 @@ std::u16string GetCategoryMenuItemTooltip(
       tooltip_id = IDS_ASH_SEARCH_CATEGORY_FILTER_MENU_WEBSITES_TOOLTIP;
       break;
     case AppListSearchControlCategory::kCannotToggle:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
   return l10n_util::GetStringUTF16(tooltip_id);
 }
@@ -402,7 +402,7 @@ class FilterMenuAdapter : public views::MenuModelAdapter {
         break;
       case AppListSearchControlCategory::kCannotToggle:
         // There shouldn't be a "Cannot toggle" option.
-        NOTREACHED_NORETURN();
+        NOTREACHED();
     }
 
     // Toggle the checkbox icon.

ash/assistant/ui/main_stage/assistant_zero_state_view.cc

@@ -169,7 +169,7 @@ void AssistantZeroStateView::RunLauncherSearchQuery(
 }
 
 void AssistantZeroStateView::OpenAssistantPage() {
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 BEGIN_METADATA(AssistantZeroStateView)

ash/birch/birch_item_remover.cc

@@ -88,7 +88,7 @@ void BirchItemRemover::RemoveItem(BirchItem* item) {
     case ash::BirchItemType::kWeather:
     case ash::BirchItemType::kLostMedia:
     case ash::BirchItemType::kTest: {
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     }
   }
 }

ash/capture_mode/capture_mode_controller.cc

@@ -458,7 +458,7 @@ std::unique_ptr<BaseCaptureModeSession> CreateSession(
                                                       active_behavior);
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

ash/capture_mode/capture_mode_session.cc

@@ -403,7 +403,7 @@ gfx::Rect GetHitTestRectForFineTunePosition(
       return gfx::Rect(gfx::Point(vertical_x, vertical_y), vertical_size);
     }
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -2663,7 +2663,7 @@ void CaptureModeSession::UpdateRegionForArrowKeys(ui::KeyboardCode key_code,
       }
       break;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 
   const bool horizontal =

ash/capture_mode/null_capture_mode_session.cc

@@ -16,7 +16,7 @@ NullCaptureModeSession::NullCaptureModeSession(
 views::Widget* NullCaptureModeSession::GetCaptureModeBarWidget() {
   // The null session will never have a bar widget, so this function should
   // never be called.
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 aura::Window* NullCaptureModeSession::GetSelectedWindow() const {

ash/clipboard/clipboard_history_controller_unittest.cc

@@ -998,7 +998,7 @@ class ClipboardHistoryRefreshDisplayFormatTest
         }
         break;
       case crosapi::mojom::ClipboardHistoryDisplayFormat::kUnknown:
-        NOTREACHED_NORETURN();
+        NOTREACHED();
     }
 
     return {};

ash/clipboard/clipboard_history_item.cc

@@ -61,7 +61,7 @@ std::optional<ui::ImageModel> DetermineDisplayImage(
   std::optional<ui::ImageModel> maybe_image;
   switch (item.display_format()) {
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kUnknown:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kText:
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kFile:
       break;

ash/clipboard/clipboard_history_item_unittest.cc

@@ -262,7 +262,7 @@ TEST_P(ClipboardHistoryItemDisplayFormatTest, DisplayImage) {
   const auto& maybe_image = item.display_image();
   switch (GetDisplayFormat()) {
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kUnknown:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kText:
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kFile:
       EXPECT_FALSE(maybe_image);

ash/clipboard/clipboard_history_util.cc

@@ -207,7 +207,7 @@ const gfx::VectorIcon& GetShortcutKeyIcon() {
       return kCampbellHeroIcon;
     case ui::mojom::MetaKey::kExternalMeta:
     case ui::mojom::MetaKey::kCommand:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/clipboard/clipboard_nudge_controller.cc

@@ -129,7 +129,7 @@ const char* GetCappedNudgeShownCountPrefKey(ClipboardNudgeType type) {
       return kShownCountDuplicateCopyNudge;
     case kScreenshotNotificationNudge:
     case kZeroStateNudge:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -400,7 +400,7 @@ void ClipboardNudgeController::ShowNudge(ClipboardNudgeType nudge_type) {
       base::UmaHistogramBoolean(kClipboardHistoryZeroStateNudgeShowCount, true);
       break;
     case ClipboardNudgeType::kScreenshotNotificationNudge:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case ClipboardNudgeType::kDuplicateCopyNudge:
       CHECK(chromeos::features::IsClipboardHistoryRefreshEnabled());
       duplicate_copy_nudge_recorder_.OnNudgeShown();

ash/clipboard/views/clipboard_history_item_view.cc

@@ -66,7 +66,7 @@ const gfx::Insets GetDeleteButtonMargins(
 
   switch (display_format) {
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kUnknown:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kText:
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kFile:
       return ClipboardHistoryViews::kTextItemDeleteButtonMargins;
@@ -237,7 +237,7 @@ ClipboardHistoryItemView::CreateFromClipboardHistoryItem(
   std::unique_ptr<ClipboardHistoryItemView> item_view;
   switch (display_format) {
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kUnknown:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kText:
     case crosapi::mojom::ClipboardHistoryDisplayFormat::kFile:
       item_view = std::make_unique<ClipboardHistoryTextItemView>(

ash/components/arc/session/arc_session_impl.cc

@@ -144,7 +144,7 @@ void ApplyHostUreadaheadMode(StartParams* params) {
       break;
     }
     default: {
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     }
   }
 }

ash/components/arc/session/arc_vm_client_adapter.cc

@@ -555,7 +555,7 @@ vm_tools::concierge::StartArcVmRequest CreateStartArcVmRequest(
       request.set_ureadahead_mode(StartArcVmRequest::UREADAHEAD_MODE_DISABLED);
       break;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 
   request.set_use_gki(base::FeatureList::IsEnabled(kArcVmGki));

ash/events/peripheral_customization_event_rewriter.cc

@@ -76,7 +76,7 @@ mojom::KeyEvent GetStaticShortcutAction(mojom::StaticShortcutAction action) {
     case mojom::StaticShortcutAction::kLeftClick:
     case mojom::StaticShortcutAction::kRightClick:
     case mojom::StaticShortcutAction::kMiddleClick:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case mojom::StaticShortcutAction::kCopy:
       key_event =
           mojom::KeyEvent(ui::VKEY_C, static_cast<int>(ui::DomCode::US_C),
@@ -512,7 +512,7 @@ mojom::ButtonPtr GetButtonFromMouseEvent(const ui::MouseEvent& mouse_event) {
           mojom::CustomizableButton::kExtra);
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 // Returns the customizable button for the scroll wheel event. Will return null

ash/events/peripheral_customization_event_rewriter_unittest.cc

@@ -481,7 +481,7 @@ std::string ConvertToString(const ui::Event& event) {
   if (event.IsKeyEvent()) {
     return ConvertToString(*event.AsKeyEvent());
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 mojom::Button GetButton(ui::KeyboardCode key_code) {

ash/game_dashboard/game_dashboard_context_unittest.cc

@@ -523,7 +523,7 @@ class GameDashboardContextTest : public GameDashboardTestBase {
         return gfx::Point(window_center_point.x() - x_offset,
                           window_center_point.y() + y_offset);
       default:
-        NOTREACHED_NORETURN();
+        NOTREACHED();
     }
   }
 

ash/glanceables/tasks/glanceables_task_view.cc

@@ -489,7 +489,7 @@ void GlanceablesTaskView::UpdateTaskTitleViewForState(
 
   switch (state) {
     case TaskTitleViewState::kNotInitialized:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case TaskTitleViewState::kView:
       task_title_button_ =
           tasks_title_view_->AddChildView(std::make_unique<TaskTitleButton>(
@@ -592,7 +592,7 @@ void GlanceablesTaskView::AddExtraContentForEditState() {
 void GlanceablesTaskView::UpdateContentsMargins(TaskTitleViewState state) {
   switch (state) {
     case TaskTitleViewState::kNotInitialized:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case TaskTitleViewState::kView:
       contents_view_->SetProperty(views::kMarginsKey, kContentsMargin);
       task_title_button_->SetProperty(views::kMarginsKey,

ash/glanceables/tasks/glanceables_tasks_view.cc

@@ -398,7 +398,7 @@ void GlanceablesTasksView::UpdateTasksInTaskList(
     switch (context) {
       case ListShownContext::kCachedList:
         // Cached list should always considered as successfully fetched.
-        NOTREACHED_NORETURN();
+        NOTREACHED();
       case ListShownContext::kInitialList: {
         if (GetTasksClient()->GetCachedTasksInTaskList(task_list_id)) {
           // Notify users the last updated time of the tasks with the cached

ash/picker/metrics/picker_session_metrics.cc

@@ -165,13 +165,13 @@ cros_events::PickerResultSource GetResultSource(
             return cros_events::PickerResultSource::DRIVE_FILES;
           },
           [](const PickerSearchResult::CategoryData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [](const PickerSearchResult::SearchRequestData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [](const PickerSearchResult::EditorData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [](const PickerSearchResult::NewWindowData& data) -> ReturnType {
             return cros_events::PickerResultSource::UNKNOWN;
@@ -229,13 +229,13 @@ cros_events::PickerResultType GetResultType(
             return cros_events::PickerResultType::DRIVE_FILE;
           },
           [](const PickerSearchResult::CategoryData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [](const PickerSearchResult::SearchRequestData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [](const PickerSearchResult::EditorData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [](const PickerSearchResult::NewWindowData& data) -> ReturnType {
             return cros_events::PickerResultType::UNKNOWN;

ash/picker/model/picker_emoji_suggester.cc

@@ -102,7 +102,7 @@ std::vector<PickerSearchResult> PickerEmojiSuggester::GetSuggestedEmoji()
             base::UTF8ToUTF16(get_name_.Run(item.text))));
         break;
       case ui::EmojiPickerCategory::kGifs:
-        NOTREACHED_NORETURN();
+        NOTREACHED();
     }
   }
   return results;

ash/picker/picker_controller.cc

@@ -233,7 +233,7 @@ std::u16string TransformText(std::u16string_view text,
     case PickerSearchResult::CaseTransformData::Type::kTitleCase:
       return PickerTransformToTitleCase(text);
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void OpenLink(const GURL& url) {
@@ -450,15 +450,9 @@ void PickerController::CloseWidgetThenInsertResultOnNextFocus(
 void PickerController::OpenResult(const PickerSearchResult& result) {
   return std::visit(
       base::Overloaded{
-          [](const PickerSearchResult::TextData& data) {
-            NOTREACHED_NORETURN();
-          },
-          [](const PickerSearchResult::EmojiData& data) {
-            NOTREACHED_NORETURN();
-          },
-          [](const PickerSearchResult::ClipboardData& data) {
-            NOTREACHED_NORETURN();
-          },
+          [](const PickerSearchResult::TextData& data) { NOTREACHED(); },
+          [](const PickerSearchResult::EmojiData& data) { NOTREACHED(); },
+          [](const PickerSearchResult::ClipboardData& data) { NOTREACHED(); },
           [&](const PickerSearchResult::BrowsingHistoryData& data) {
             session_metrics_->SetOutcome(
                 PickerSessionMetrics::SessionOutcome::kOpenLink);
@@ -474,15 +468,11 @@ void PickerController::OpenResult(const PickerSearchResult& result) {
                 PickerSessionMetrics::SessionOutcome::kOpenLink);
             OpenLink(data.url);
           },
-          [](const PickerSearchResult::CategoryData& data) {
-            NOTREACHED_NORETURN();
-          },
+          [](const PickerSearchResult::CategoryData& data) { NOTREACHED(); },
           [](const PickerSearchResult::SearchRequestData& data) {
-            NOTREACHED_NORETURN();
-          },
-          [](const PickerSearchResult::EditorData& data) {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
+          [](const PickerSearchResult::EditorData& data) { NOTREACHED(); },
           [&](const PickerSearchResult::NewWindowData& data) {
             session_metrics_->SetOutcome(
                 PickerSessionMetrics::SessionOutcome::kCreate);
@@ -743,7 +733,7 @@ void PickerController::InsertResultOnNextFocus(
                 aura::client::GetFocusClient(widget_->GetNativeView()),
                 data.item_id);
           },
-          [](std::monostate) { NOTREACHED_NORETURN(); },
+          [](std::monostate) { NOTREACHED(); },
       },
       GetInsertionContentForResult(result));
 

ash/picker/search/picker_search_aggregator.cc

@@ -216,7 +216,7 @@ void PickerSearchAggregator::HandleSearchSourceResults(
           DeduplicateDriveFilesFromLinks(results, std::move(*links));
           link_drive_dedupe_state_ = std::monostate();
         } else {
-          NOTREACHED_NORETURN();
+          NOTREACHED();
         }
       } else if (section_type == PickerSectionType::kLinks) {
         if (std::holds_alternative<std::monostate>(link_drive_dedupe_state_)) {
@@ -226,7 +226,7 @@ void PickerSearchAggregator::HandleSearchSourceResults(
           DeduplicateDriveLinksFromIds(results, std::move(*drive_ids));
           link_drive_dedupe_state_ = std::monostate();
         } else {
-          NOTREACHED_NORETURN();
+          NOTREACHED();
         }
       }
 

ash/picker/views/picker_emoji_bar_view.cc

@@ -90,7 +90,7 @@ std::u16string GetTooltipForEmojiResult(
       return l10n_util::GetStringFUTF16(
           IDS_PICKER_EMOTICON_ITEM_ACCESSIBLE_NAME, data.name);
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 // Creates an item view for a search result. Only supports results that can be

ash/picker/views/picker_section_view.cc

@@ -192,7 +192,7 @@ std::unique_ptr<PickerItemView> PickerSectionView::CreateItemFromResult(
             return item_view;
           },
           [&](const PickerSearchResult::EmojiData& data) -> ReturnType {
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           [&](const PickerSearchResult::ClipboardData& data) -> ReturnType {
             auto item_view = std::make_unique<PickerListItemView>(
@@ -216,7 +216,7 @@ std::unique_ptr<PickerItemView> PickerSectionView::CreateItemFromResult(
                                            available_width);
                 break;
               case PickerSearchResult::ClipboardData::DisplayFormat::kHtml:
-                NOTREACHED_NORETURN();
+                NOTREACHED();
             }
             if (icon) {
               item_view->SetLeadingIcon(ui::ImageModel::FromVectorIcon(
@@ -414,7 +414,7 @@ PickerItemView* PickerSectionView::AddItem(
     return AddItemWithSubmenu(std::unique_ptr<PickerItemWithSubmenuView>(
         views::AsViewClass<PickerItemWithSubmenuView>(item.release())));
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 PickerItemView* PickerSectionView::AddResult(

ash/public/cpp/app_list/app_list_metrics.cc

@@ -101,7 +101,7 @@ bool IsAppListShowSourceUserTriggered(AppListShowSource show_source) {
     case AppListShowSource::kWelcomeTour:
       return false;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void RecordSearchResultOpenTypeHistogram(AppListLaunchedFrom launch_location,

ash/public/cpp/wallpaper/wallpaper_types.cc

@@ -39,7 +39,7 @@ std::string WallpaperTypeToString(WallpaperType type) {
     case WallpaperType::kSeaPen:
       return "SeaPen";
     case WallpaperType::kCount:
-      NOTREACHED_NORETURN() << " Unhandled type=" << base::to_underlying(type);
+      NOTREACHED() << " Unhandled type=" << base::to_underlying(type);
   }
 }
 

ash/public/mojom/accelerator_actions_mojom_traits.cc

@@ -352,7 +352,7 @@ EnumTraits<mojom_accelerator_action, ash::AcceleratorAction>::ToMojom(
       return mojom_accelerator_action::kDevToggleUnifiedDesktop;
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 bool EnumTraits<mojom_accelerator_action, ash::AcceleratorAction>::FromMojom(
@@ -858,7 +858,7 @@ bool EnumTraits<mojom_accelerator_action, ash::AcceleratorAction>::FromMojom(
       *out = ash::AcceleratorAction::kDevToggleUnifiedDesktop;
       return true;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace mojo

ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc

@@ -203,7 +203,7 @@ const std::array<uint8_t, kBlockByteSize> CreateActionRequest(
       request[kDataIdOrSizeIndex] = data_id_or_size.value();
       break;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 
   // Fill unused trailing bytes with random (salt) values.

ash/rounded_display/rounded_display_pixeltest.cc

@@ -38,7 +38,7 @@ std::string ToDisplaySpecRotationString(display::Display::Rotation rotation) {
       return "/l";
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 std::string ToDisplaySpecDeviceScaleFactorString(int scale_factor) {

ash/scalable_iph/wallpaper_ash_notification_view.cc

@@ -37,7 +37,7 @@ int GetResourceId(int preview_index) {
     default:
       CHECK(false);
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 #endif  // BUILDFLAG(ENABLE_CROS_SCALABLE_IPH)
 

ash/system/focus_mode/focus_mode_chip_carousel.cc

@@ -335,7 +335,7 @@ void FocusModeChipCarousel::OnChevronPressed(bool left) {
   }
 
   // Pressing a chevron should always result in a scroll.
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void FocusModeChipCarousel::ScrollToChip(views::View* chip) {

ash/system/focus_mode/sounds/focus_mode_sounds_controller.cc

@@ -241,7 +241,7 @@ void RecordPlaylistPlayedLatency(focus_mode_util::SoundType playlist_type,
       break;
     case focus_mode_util::SoundType::kNone:
       // A selected playlist should always have a valid type.
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 
   base::UmaHistogramCustomCounts(
@@ -259,7 +259,7 @@ focus_mode_histogram_names::FocusModePlaylistChosen GetPlaylistChosenType(
     case focus_mode_util::SoundType::kYouTubeMusic:
       return youtube_music_chosen[index];
     case focus_mode_util::SoundType::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/system/focus_mode/sounds/focus_mode_sounds_view.cc

@@ -238,7 +238,7 @@ void FocusModeSoundsView::OnPlaylistStateChanged() {
       }
       break;
     case focus_mode_util::SoundType::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/system/input_device_settings/input_device_settings_metrics_manager.cc

@@ -187,7 +187,7 @@ std::string GetModifierKeyName(ui::mojom::ModifierKey modifier_key) {
       return modifier.key_name;
     }
   }
-  NOTREACHED_NORETURN() << "MODIFIER KEY: " << (int)modifier_key;
+  NOTREACHED() << "MODIFIER KEY: " << (int)modifier_key;
 }
 
 int GetNumberOfNonDefaultRemappings(
@@ -239,7 +239,7 @@ ui::mojom::SixPackShortcutModifier GetSixPackKeyModifier(
     case ui::VKEY_NEXT:
       return keyboard.settings->six_pack_key_remappings->page_down;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 std::string GetSixPackKeyMetricName(const std::string& prefix,
@@ -267,7 +267,7 @@ std::string GetSixPackKeyMetricName(const std::string& prefix,
       key_name = "PageDown";
       break;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
   return base::StrCat({prefix, "SixPackKeys.", key_name,
                        is_initial_value ? ".Initial" : ".Changed"});

ash/system/input_device_settings/input_device_settings_notification_controller.cc

@@ -235,7 +235,7 @@ std::u16string GetRightClickRewriteNotificationMessage(
           IDS_ASH_DEVICE_SETTINGS_NOTIFICATIONS_LAUNCHER_RIGHT_CLICK,
           launcher_key_name);
     case SimulateRightClickModifier::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -261,7 +261,7 @@ std::string GetRightClickNotificationId(
     case SimulateRightClickModifier::kSearch:
       return kSearchRightClickRewriteNotificationId;
     case SimulateRightClickModifier::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -336,7 +336,7 @@ std::u16string GetSixPackKeyName(ui::KeyboardCode key_code) {
       return l10n_util::GetStringUTF16(
           IDS_ASH_DEVICE_SETTINGS_SIX_PACK_KEY_PAGE_DOWN);
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -358,7 +358,7 @@ std::u16string GetSixPackShortcutUpdatedString(ui::KeyboardCode key_code) {
       return l10n_util::GetStringUTF16(
           IDS_ASH_SETTINGS_KEYBOARD_USE_FN_KEY_FOR_DELETE_NUDGE_DESCRIPTION);
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -450,7 +450,7 @@ std::string GetSixPackNotificationId(ui::KeyboardCode key_code, int device_id) {
       notification_id = kSixPackKeyPageDownRewriteNotificationId;
       break;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
   return notification_id + kDelimiter + base::NumberToString(device_id);
 }

ash/system/mahi/mahi_error_status_view_pixeltest.cc

@@ -54,7 +54,7 @@ std::string GetScreenShotNameForErrorStatus(MahiResponseStatus status) {
       return "UnsupportedLanguage";
     case chromeos::MahiResponseStatus::kLowQuota:
     case chromeos::MahiResponseStatus::kSuccess:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/system/mahi/mahi_ui_controller.cc

@@ -147,7 +147,7 @@ void MahiUiController::Retry(VisibilityState origin_state) {
           MahiUiUpdate(MahiUiUpdateType::kSummaryAndOutlinesReloaded));
       return;
     case VisibilityState::kError:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/system/mahi/mahi_utils.cc

@@ -24,7 +24,7 @@ bool CalculateRetryLinkVisible(chromeos::MahiResponseStatus error) {
       return false;
     case chromeos::MahiResponseStatus::kLowQuota:
     case chromeos::MahiResponseStatus::kSuccess:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -45,7 +45,7 @@ int GetErrorStatusViewTextId(chromeos::MahiResponseStatus error) {
       return IDS_ASH_MAHI_ERROR_STATUS_LABEL_UNSUPPORTED_LANGUAGE;
     case chromeos::MahiResponseStatus::kLowQuota:
     case chromeos::MahiResponseStatus::kSuccess:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     default:
       // TOOD(b/343472496): Remove this when UI is added.
       return IDS_ASH_MAHI_ERROR_STATUS_LABEL_GENERAL;

ash/system/network/network_detailed_network_view_impl.cc

@@ -60,7 +60,7 @@ std::u16string GetLabelForConfigureNetworkEntry(NetworkType type) {
     case NetworkType::kMobile:
       return l10n_util::GetStringUTF16(IDS_ASH_QUICK_SETTINGS_ADD_ESIM);
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -79,7 +79,7 @@ std::optional<std::u16string> GetTooltipForConfigureNetworkEntry(
     case NetworkType::kMobile:
       return l10n_util::GetStringUTF16(GetAddESimTooltipMessageId());
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -97,7 +97,7 @@ int GetViewIDForConfigureNetworkEntry(NetworkType type) {
     case NetworkType::kMobile:
       return VIEW_ID_ADD_ESIM_ENTRY;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 }  // namespace

ash/system/notification_center/message_center_utils.cc

@@ -60,7 +60,7 @@ std::string GenerateGroupParentNotificationIdSuffix(
     case message_center::NotifierType::APPLICATION:
     case message_center::NotifierType::CROSTINI_APPLICATION:
     case message_center::NotifierType::PHONE_HUB:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/system/power/battery_notification.cc

@@ -226,7 +226,7 @@ void HandlePowerNotificationButtonClick(
       break;
     }
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/system/privacy_hub/privacy_hub_notification_unittest.cc

@@ -169,7 +169,7 @@ class PrivacyHubNotificationTextTest
                   SensorDisabledNotificationDelegate::Sensor::kMicrophone};
         }
       }
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     }();
   }
 
@@ -226,7 +226,7 @@ class PrivacyHubNotificationTextTest
             IDS_PRIVACY_HUB_CAMERA_OFF_NOTIFICATION_MESSAGE_WITH_ONE_APP_NAME,
             IDS_PRIVACY_HUB_CAMERA_OFF_NOTIFICATION_MESSAGE_WITH_TWO_APP_NAMES};
       }
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     }();
 
     const int max_size = 150;

ash/user_education/welcome_tour/welcome_tour_metrics.cc

@@ -235,7 +235,7 @@ std::string ToString(Interaction interaction) {
     case Interaction::kSettingsApp:
       return "SettingsApp";
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 // These strings are persisted to logs. These string values should never be
@@ -261,7 +261,7 @@ std::string ToString(Step step) {
     case Step::kStatusArea:
       return "StatusArea";
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace ash::welcome_tour_metrics

ash/webui/camera_app_ui/camera_app_events_sender.cc

@@ -104,7 +104,7 @@ camera_app::mojom::RecordType GetRecordType(
   } else if (record_type_details->is_timelapse_video_details()) {
     return camera_app::mojom::RecordType::kTimelapse;
   } else {
-    NOTREACHED_NORETURN() << "Unexpected record type";
+    NOTREACHED() << "Unexpected record type";
   }
 }
 
@@ -289,7 +289,7 @@ void CameraAppEventsSender::SendOpenCameraEvent(
       camera_module_id = "others";
     }
   } else {
-    NOTREACHED_NORETURN() << "Unexpected camera module type";
+    NOTREACHED() << "Unexpected camera module type";
   }
   metrics::structured::StructuredMetricsClient::Record(std::move(
       cros_events::CameraApp_OpenCamera().SetCameraModuleId(camera_module_id)));

ash/webui/files_internals/files_internals_ui.cc

@@ -112,7 +112,7 @@ void FilesInternalsUI::HandleRequest(
     return;
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 WEB_UI_CONTROLLER_TYPE_IMPL(FilesInternalsUI)

ash/webui/print_preview_cros/backend/pdf_printer_handler.cc

@@ -25,7 +25,7 @@ namespace {
 class PrintingContextDelegate : public ::printing::PrintingContext::Delegate {
  public:
   // PrintingContext::Delegate methods.
-  gfx::NativeView GetParentView() override { NOTREACHED_NORETURN(); }
+  gfx::NativeView GetParentView() override { NOTREACHED(); }
   std::string GetAppLocale() override {
     // TODO(b/323421684): Fetch application locale.
     return "en-US";

ash/webui/projector_app/projector_xhr_sender.cc

@@ -126,7 +126,7 @@ inline std::string RequestTypeToString(projector::mojom::RequestType method) {
       return "DELETE";
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 // The maximum number of retries for the SimpleURLLoader requests. Three times

ash/webui/projector_app/untrusted_projector_page_handler_impl.cc

@@ -65,7 +65,7 @@ std::string GetPrefName(projector::mojom::PrefsThatProjectorCanAskFor pref) {
       return ash::prefs::kProjectorGalleryOnboardingShowCount;
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

ash/wm/desks/desk_button/desk_button_container.cc

@@ -203,7 +203,7 @@ std::u16string DeskButtonContainer::GetTitleForView(
   } else if (view == next_desk_button_) {
     return next_desk_button_->GetTitle();
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void DeskButtonContainer::Init(DeskButtonWidget* desk_button_widget) {

ash/wm/overview/birch/birch_bar_controller.cc

@@ -73,7 +73,7 @@ std::string GetPrefNameFromSuggestionType(BirchSuggestionType type) {
       return prefs::kBirchUseCoral;
     case BirchSuggestionType::kExplore:
     case BirchSuggestionType::kUndefined:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

ash/wm/overview/birch/birch_bar_menu_model_adapter.cc

@@ -71,8 +71,7 @@ BirchSuggestionType CommandIdToSuggestionType(int command_id) {
     default:
       break;
   }
-  NOTREACHED_NORETURN() << "No matching suggestion type for command Id: "
-                        << command_id;
+  NOTREACHED() << "No matching suggestion type for command Id: " << command_id;
 }
 
 }  // namespace

ash/wm/overview/birch/birch_bar_view.cc

@@ -224,8 +224,8 @@ void BirchBarView::SetState(State state) {
 
 #if DCHECK_IS_ON()
   if (!IsValidStateTransition(state_, state)) {
-    NOTREACHED_NORETURN() << "Transition from state " << state_ << " to state "
-                          << state << " is invalid.";
+    NOTREACHED() << "Transition from state " << state_ << " to state " << state
+                 << " is invalid.";
   }
 #endif
 
@@ -318,7 +318,7 @@ void BirchBarView::SetupChips(const std::vector<raw_ptr<BirchItem>>& items) {
     case State::kReloading:
       break;
     case State::kShuttingDown:
-      NOTREACHED_NORETURN() << "Birch bar cannot be setup while shutting down.";
+      NOTREACHED() << "Birch bar cannot be setup while shutting down.";
   }
 
   // Change relayout reason to setup if new chips are filled in the empty bar.
@@ -616,7 +616,7 @@ void BirchBarView::FadeInChips() {
       animation_duration = kFadeInDurationAfterReloading;
       break;
     case State::kShuttingDown:
-      NOTREACHED_NORETURN() << "Birch bar cannot fade in while shutting down.";
+      NOTREACHED() << "Birch bar cannot fade in while shutting down.";
   }
 
   views::AnimationBuilder animation_builder;
@@ -649,8 +649,7 @@ void BirchBarView::FadeOutChips() {
     case State::kLoadingByUser:
     case State::kLoading:
     case State::kNormal:
-      NOTREACHED_NORETURN()
-          << "Birch bar only fades out on shutting down and reloading";
+      NOTREACHED() << "Birch bar only fades out on shutting down and reloading";
   }
 
   if (!chips_.size()) {

ash/wm/overview/birch/birch_chip_loader_view.cc

@@ -89,7 +89,7 @@ void BirchChipLoaderView::AddAnimationToBuilder(
           .SetOpacity(loader_layer, 0.0f);
       return;
     case Type::kNone:
-      NOTREACHED_NORETURN() << "Please set a loading type for birch bar loader";
+      NOTREACHED() << "Please set a loading type for birch bar loader";
   }
 }
 

ash/wm/overview/overview_grid.cc

@@ -566,7 +566,7 @@ int GetTooltipID(DeskTemplateType type, TooltipStatus status) {
       return kSaveForLaterButtonTooltipIDs[static_cast<int>(status)];
     case DeskTemplateType::kFloatingWorkspace:
     case DeskTemplateType::kUnknown:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -1407,7 +1407,7 @@ void OverviewGrid::CalculateWindowListAnimationStates(
       CHECK(target_bounds.empty());
       break;
     case OverviewTransition::kInOverview:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 
   // On top items are items that are higher up on the z-order, or in the always

ash/wm/overview/overview_session.cc

@@ -104,7 +104,7 @@ aura::Window* GetWindowForSelection(
     }
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 // A self-deleting window state observer that runs the given callback when its

ash/wm/overview/overview_session_unittest.cc

@@ -7305,7 +7305,7 @@ class SplitViewOverviewSessionTest : public OverviewTestBase {
         case SplitViewDragIndicators::WindowDraggingState::kFromTop:
         case SplitViewDragIndicators::WindowDraggingState::kFromShelf:
         case SplitViewDragIndicators::WindowDraggingState::kFromFloat:
-          NOTREACHED_NORETURN();
+          NOTREACHED();
       }
     }
 

ash/wm/overview/scoped_overview_wallpaper_clipper.cc

@@ -182,7 +182,7 @@ void ScopedOverviewWallpaperClipper::RefreshWallpaperClipBounds(
       rounded_corners = gfx::RoundedCornersF();
       break;
     case AnimationType::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 
   views::AnimationBuilder animation_builder;

ash/wm/splitview/split_view_utils.cc

@@ -141,7 +141,7 @@ AnimationValues GetAnimationValuesForType(SplitviewAnimationType type) {
                   ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET};
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void ApplyAnimationSettings(
@@ -392,7 +392,7 @@ WindowStateType GetWindowStateTypeFromSnapPosition(SnapPosition snap_position) {
     case SnapPosition::kSecondary:
       return WindowStateType::kSecondarySnapped;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -403,7 +403,7 @@ SnapPosition ToSnapPosition(chromeos::WindowStateType type) {
     case WindowStateType::kSecondarySnapped:
       return SnapPosition::kSecondary;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -846,7 +846,7 @@ SnapViewType ToSnapViewType(chromeos::WindowStateType state_type) {
     case chromeos::WindowStateType::kSecondarySnapped:
       return SnapViewType::kSecondary;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

base/android/binder.cc

@@ -529,7 +529,7 @@ binder_status_t SupportsBinderBase::OnIBinderTransact(AIBinder* binder,
   }
 
   // If binder NDK is unsupported, nobody will be calling this method.
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace internal

base/android/binder_unittest.cc

@@ -155,7 +155,7 @@ TEST_F(BinderTest, ReadWriteEmptyByteArray) {
         EXPECT_TRUE(reader
                         .ReadByteArray([](size_t size) -> uint8_t* {
                           // We don't call the allocator for empty arrays.
-                          NOTREACHED_NORETURN();
+                          NOTREACHED();
                         })
                         .has_value());
       });
@@ -420,7 +420,7 @@ class MathService : public SupportsBinder<MathInterface::Class> {
       }
 
       default:
-        NOTREACHED_NORETURN();
+        NOTREACHED();
     }
     return base::ok();
   }

cc/animation/filter_animation_curve.cc

@@ -100,7 +100,7 @@ std::unique_ptr<gfx::AnimationCurve> KeyframedFilterAnimationCurve::Clone()
 // do not use timing functions.
 FilterOperations KeyframedFilterAnimationCurve::GetValue(
     base::TimeDelta t) const {
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 FilterOperations KeyframedFilterAnimationCurve::GetTransformedValue(

cc/input/hit_test_opaqueness.cc

@@ -53,7 +53,7 @@ HitTestOpaqueness UnionHitTestOpaqueness(const gfx::Rect& rect1,
       return rect1.Contains(rect2) ? HitTestOpaqueness::kOpaque
                                    : HitTestOpaqueness::kMixed;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace cc

cc/paint/paint_op.cc

@@ -359,7 +359,7 @@ std::string PaintOpTypeToString(PaintOpType type) {
   TYPES(M)
 #undef M
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 bool IsDiscardableImage(const PaintImage& image,

cc/paint/paint_op_buffer.cc

@@ -440,7 +440,7 @@ const PaintOp& PaintOpBuffer::GetOpAtForTesting(size_t index) const {
     }
     --index;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace cc

cc/paint/paint_shader.cc

@@ -290,7 +290,7 @@ bool PaintShader::HasDiscardableImages(
       }
       return false;
     case Type::kShaderCount:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

cc/trees/property_tree.cc

@@ -1521,7 +1521,7 @@ uint32_t ScrollTree::GetMainThreadRepaintReasons(const ScrollNode& node) const {
                      ~MainThreadScrollingReason::kPopupNoThreadedInput;
   if (!MainThreadScrollingReason::AreRepaintReasons(reasons)) {
     SCOPED_CRASH_KEY_NUMBER("Bug349709014", "reasons", reasons);
-    NOTREACHED_NORETURN();
+    NOTREACHED();
   }
   return reasons;
 }

cc/trees/single_thread_proxy.cc

@@ -1215,7 +1215,7 @@ DrawResult SingleThreadProxy::ScheduledActionDrawForced() {
 }
 
 void SingleThreadProxy::ScheduledActionUpdateDisplayTree() {
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void SingleThreadProxy::ScheduledActionCommit() {

chrome/browser/accessibility/accessibility_extension_api_ash.cc

@@ -76,7 +76,7 @@ ash::AccessibilityToastType ConvertToastType(
     case accessibility_private::ToastType::kDictationMicMuted:
       return ash::AccessibilityToastType::kDictationMicMuted;
     case accessibility_private::ToastType::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

chrome/browser/accessibility/media_app/ax_media_app_untrusted_handler.cc

@@ -650,9 +650,9 @@ void AXMediaAppUntrustedHandler::SendAXTreeToAccessibilityService(
   ui::AXTreeUpdate update;
   serializer.MarkSubtreeDirty(manager.GetRoot()->id());
   if (!serializer.SerializeChanges(manager.GetRoot(), &update)) {
-    NOTREACHED_NORETURN() << "Failure to serialize should have already caused "
-                             "the process to crash due to the `crash_on_error` "
-                             "in `AXTreeSerializer` constructor call.";
+    NOTREACHED() << "Failure to serialize should have already caused "
+                    "the process to crash due to the `crash_on_error` "
+                    "in `AXTreeSerializer` constructor call.";
   }
   if (pending_serialized_updates_for_testing_) {
     ui::AXTreeUpdate simplified_update = update;

chrome/browser/ai/ai_manager_keyed_service.cc

@@ -93,7 +93,7 @@ ConvertOnDeviceModelEligibilityReasonToModelAvailabilityCheckResult(
     case optimization_guide::OnDeviceModelEligibilityReason::kSuccess:
       NOTREACHED_IN_MIGRATION();
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

chrome/browser/apps/app_service/publishers/arc_apps.cc

@@ -253,9 +253,8 @@ std::optional<arc::UserInteractionType> GetUserInterationType(
       // These LaunchSources do not launch ARC apps. When adding a new
       // LaunchSource, if it is expected to launch ARC apps, add a new
       // UserInteractionType above. Otherwise, add it here.
-      NOTREACHED_NORETURN()
-          << "Must define an ARC UserInteractionType for LaunchSource "
-          << static_cast<uint32_t>(launch_source);
+      NOTREACHED() << "Must define an ARC UserInteractionType for LaunchSource "
+                   << static_cast<uint32_t>(launch_source);
   }
   return user_interaction_type;
 }

chrome/browser/apps/link_capturing/web_apps_intent_picker_delegate.cc

@@ -192,7 +192,7 @@ void WebAppsIntentPickerDelegate::RecordOutputMetrics(
     case apps::IntentPickerCloseReason::PREFERRED_APP_FOUND:
       break;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 
@@ -201,7 +201,7 @@ void WebAppsIntentPickerDelegate::RecordOutputMetrics(
 void WebAppsIntentPickerDelegate::PersistIntentPreferencesForApp(
     PickerEntryType entry_type,
     const std::string& app_id) {
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 void WebAppsIntentPickerDelegate::LaunchApp(content::WebContents* web_contents,

chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.cc

@@ -53,7 +53,7 @@ SyncActionMetrics convertToHistogramEnum(
     case ::sync_file_system::SyncAction::SYNC_ACTION_DELETED:
       return SyncActionMetrics::kDeleted;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc

@@ -151,7 +151,7 @@ ash::assistant::LauncherSearchIphQueryType GetQueryType(
   if (query == u"50+94/5") {
     return ash::assistant::LauncherSearchIphQueryType::kCalculation;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

chrome/browser/ash/app_list/search/keyboard_shortcut_result.cc

@@ -248,7 +248,7 @@ std::optional<IconCode> KeyboardShortcutResult::GetIconCodeFromKeyboardCode(
           return IconCode::kKeyboardShortcutLauncherRefresh;
         case ui::mojom::MetaKey::kExternalMeta:
         case ui::mojom::MetaKey::kCommand:
-          NOTREACHED_NORETURN();
+          NOTREACHED();
       }
     case (KeyboardCode::VKEY_MEDIA_LAUNCH_APP2):
       return IconCode::kKeyboardShortcutCalculator;

chrome/browser/ash/app_mode/app_launch_utils.cc

@@ -165,7 +165,7 @@ void SetOneTimeAutoLaunchKioskAppId(PrefService& local_state,
       local_state.CommitPendingWrite();
       return;
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace ash

chrome/browser/ash/app_mode/kiosk_controller_impl.cc

@@ -89,7 +89,7 @@ KioskApp EmptyKioskApp(const KioskAppId& app_id) {
                       /*icon=*/gfx::ImageSkia(),
                       /*url=*/GURL()};
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

chrome/browser/ash/app_mode/load_profile.cc

@@ -166,7 +166,7 @@ class SigninPerformer : public LoginPerformer::Delegate, public CancellableJob {
   }
   void OnOldEncryptionDetected(std::unique_ptr<UserContext> user_context,
                                bool has_incomplete_migration) override {
-    NOTREACHED_NORETURN();
+    NOTREACHED();
   }
 
   ResultCallback on_done_;
@@ -367,7 +367,7 @@ void ProfileLoader::LoginAsKioskAccount() {
               return self->ReturnError(
                   LoginFailureToKioskLaunchError(*auth_failure));
             }
-            NOTREACHED_NORETURN();
+            NOTREACHED();
           },
           // Safe because `this` owns `current_step_`
           base::Unretained(this)));

chrome/browser/ash/borealis/borealis_installer_impl.cc

@@ -159,7 +159,7 @@ class BorealisInstallerImpl::Installation
                 "Unexpected DLC failure, please file feedback."};
     }
 
-    NOTREACHED_NORETURN();
+    NOTREACHED();
   }
 
   // As part of its installation we perform a dry run of borealis. This ensures

chrome/browser/ash/calendar/calendar_keyed_service_unittest.cc

@@ -123,7 +123,7 @@ class CalendarKeyedServiceIOTest : public testing::Test {
           google_apis::test_util::GetTestFilePath(
               "calendar/group_calendar_events.json"));
     }
-    NOTREACHED_NORETURN();
+    NOTREACHED();
   }
 
   content::BrowserTaskEnvironment task_environment_{

chrome/browser/ash/crosapi/cec_private_ash.cc

@@ -31,7 +31,7 @@ PowerState ConvertCecServiceClientPowerState(
       return PowerState::kUnknown;
   }
 
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 }
 
 }  // namespace

chrome/browser/ash/crosapi/network_settings_service_ash.cc

@@ -64,14 +64,14 @@ void NetworkSettingsServiceAsh::BindReceiver(
 
 void NetworkSettingsServiceAsh::SetExtensionProxy(
     crosapi::mojom::ProxyConfigPtr proxy_config) {
-  NOTREACHED_NORETURN()
+  NOTREACHED()
       << "This version of Ash receives the proxy pref from the Prefs mojo "
          "service. Please use SetExtensionControllingProxyMetadata to set the "
          "extension metadata.";
 }
 
 void NetworkSettingsServiceAsh::ClearExtensionProxy() {
-  NOTREACHED_NORETURN()
+  NOTREACHED()
       << "This version of Ash clears the proxy pref from the Prefs mojo "
          "service. Please use ClearExtensionControllingProxyMetadata to clear "
          "the extension metadata.";

chrome/browser/ash/events/event_rewriter_delegate_impl.cc

@@ -288,7 +288,7 @@ EventRewriterDelegateImpl::GetShortcutModifierForSixPackKey(
     case ui::KeyboardCode::VKEY_INSERT:
       return settings->six_pack_key_remappings->insert;
     default:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

chrome/browser/ash/file_system_provider/cloud_file_system.cc

@@ -58,7 +58,7 @@ std::ostream& operator<<(std::ostream& out, OpenFileMode mode) {
     case OpenFileMode::OPEN_FILE_MODE_WRITE:
       return out << "OPEN_FILE_MODE_WRITE";
   }
-  NOTREACHED_NORETURN() << "Unknown OpenFileMode: " << mode;
+  NOTREACHED() << "Unknown OpenFileMode: " << mode;
 }
 
 std::ostream& operator<<(std::ostream& out,
@@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& out,
     case ChangeType::DELETED:
       return out << "DELETED";
   }
-  NOTREACHED_NORETURN() << "Unknown ChangeType: " << type;
+  NOTREACHED() << "Unknown ChangeType: " << type;
 }
 
 std::ostream& operator<<(std::ostream& out, CloudFileInfo* cloud_file_info) {

chrome/browser/ash/fileapi/diversion_backend_delegate.cc

@@ -565,7 +565,7 @@ void DiversionBackendDelegate::OnDiversionFinished(
 
         switch (call_site) {
           case OnDiversionFinishedCallSite::kEnsureFileExists:
-            NOTREACHED_NORETURN();
+            NOTREACHED();
 
           case OnDiversionFinishedCallSite::kCopyFileLocal: {
             if (!scoped_fd.is_valid()) {

chrome/browser/ash/fileapi/diversion_backend_delegate_unittest.cc

@@ -161,7 +161,7 @@ class FakeFSBDelegate : public FileSystemBackendDelegate {
 
   storage::WatcherManager* GetWatcherManager(
       storage::FileSystemType type) override {
-    NOTREACHED_NORETURN();
+    NOTREACHED();
   }
 
  private:

chrome/browser/ash/fileapi/diversion_file_manager_unittest.cc

@@ -165,7 +165,7 @@ TEST_F(DiversionFileManagerTest, Writes) {
       [](StoppedReason stopped_reason, const storage::FileSystemURL& url,
          base::ScopedFD scoped_fd, int64_t file_size, base::File::Error error) {
         // We shouldn't get here. We should get to on_explicit_finish instead.
-        NOTREACHED_NORETURN();
+        NOTREACHED();
       };
   ASSERT_EQ(StartDivertingResult::kOK,
             dfm->StartDiverting(foo_url, base::Seconds(15),

chrome/browser/ash/input_method/editor_text_query_provider.cc

@@ -100,7 +100,7 @@ orca::mojom::TextQueryErrorCode ConvertErrorCode(
     case manta::MantaStatusCode::kRestrictedCountry:
       return orca::mojom::TextQueryErrorCode::kRestrictedRegion;
     case manta::MantaStatusCode::kOk:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
   }
 }
 

chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc

@@ -255,7 +255,7 @@ std::string ToString(KioskAppLaunchError::Error error) {
     CASE(kLacrosDataMigrationStarted);
     CASE(kLacrosBackwardDataMigrationStarted);
   }
-  NOTREACHED_NORETURN();
+  NOTREACHED();
 #undef CASE
 }
 
@@ -602,7 +602,7 @@ void KioskLaunchController::OnLaunchFailed(KioskAppLaunchError::Error error) {
 
   switch (error) {
     case Error::kNone:
-      NOTREACHED_NORETURN();
+      NOTREACHED();
     case Error::kCryptohomedNotRunning:
     case Error::kAlreadyMounted:
       // Reboot the device on recoverable cryptohome errors. Do not save error

chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc

@@ -305,7 +305,7 @@ KioskApp KioskBaseTest::test_kiosk_app() const {
       return app;
     }
   }
-  NOTREACHED_NORETURN() << "App not in KioskController: " << test_app_id();
+  NOTREACHED() << "App not in KioskController: " << test_app_id();
 }
 
 }  // namespace ash

chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc

@@ -644,7 +644,7 @@ class EnrollmentErrorScreenTest
   bool IsManualEnrollmentMode(policy::EnrollmentConfig::Mode mode) const {
     switch (mode) {
       case policy::EnrollmentConfig::MODE_NONE:
-        NOTREACHED_NORETURN() << "Bad enrollment mode " << mode;
+        NOTREACHED() << "Bad enrollment mode " << mode;
       case policy::EnrollmentConfig::MODE_MANUAL:
       case policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT:
       case policy::EnrollmentConfig::MODE_LOCAL_ADVERTISED: