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 <[email protected]>
Owners-Override: Daniel Cheng <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Commit-Queue: Peter Boström <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1342096}
diff --git a/chrome/browser/accessibility/accessibility_extension_api_ash.cc b/chrome/browser/accessibility/accessibility_extension_api_ash.cc
index 0cf960a..f37199c8 100644
--- a/chrome/browser/accessibility/accessibility_extension_api_ash.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api_ash.cc
@@ -76,7 +76,7 @@
case accessibility_private::ToastType::kDictationMicMuted:
return ash::AccessibilityToastType::kDictationMicMuted;
case accessibility_private::ToastType::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/accessibility/media_app/ax_media_app_untrusted_handler.cc b/chrome/browser/accessibility/media_app/ax_media_app_untrusted_handler.cc
index 7372a9e..4b4aad2 100644
--- a/chrome/browser/accessibility/media_app/ax_media_app_untrusted_handler.cc
+++ b/chrome/browser/accessibility/media_app/ax_media_app_untrusted_handler.cc
@@ -650,9 +650,9 @@
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;
diff --git a/chrome/browser/ai/ai_manager_keyed_service.cc b/chrome/browser/ai/ai_manager_keyed_service.cc
index d883c571..d7c5af2 100644
--- a/chrome/browser/ai/ai_manager_keyed_service.cc
+++ b/chrome/browser/ai/ai_manager_keyed_service.cc
@@ -93,7 +93,7 @@
case optimization_guide::OnDeviceModelEligibilityReason::kSuccess:
NOTREACHED_IN_MIGRATION();
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/apps/app_service/publishers/arc_apps.cc b/chrome/browser/apps/app_service/publishers/arc_apps.cc
index c3e441d..d9b5a51 100644
--- a/chrome/browser/apps/app_service/publishers/arc_apps.cc
+++ b/chrome/browser/apps/app_service/publishers/arc_apps.cc
@@ -253,9 +253,8 @@
// 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;
}
diff --git a/chrome/browser/apps/link_capturing/web_apps_intent_picker_delegate.cc b/chrome/browser/apps/link_capturing/web_apps_intent_picker_delegate.cc
index 0ea8ef0a..d481be2 100644
--- a/chrome/browser/apps/link_capturing/web_apps_intent_picker_delegate.cc
+++ b/chrome/browser/apps/link_capturing/web_apps_intent_picker_delegate.cc
@@ -192,7 +192,7 @@
case apps::IntentPickerCloseReason::PREFERRED_APP_FOUND:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -201,7 +201,7 @@
void WebAppsIntentPickerDelegate::PersistIntentPreferencesForApp(
PickerEntryType entry_type,
const std::string& app_id) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void WebAppsIntentPickerDelegate::LaunchApp(content::WebContents* web_contents,
diff --git a/chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.cc b/chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.cc
index 0eff0fb..f42c416 100644
--- a/chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.cc
+++ b/chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.cc
@@ -53,7 +53,7 @@
case ::sync_file_system::SyncAction::SYNC_ACTION_DELETED:
return SyncActionMetrics::kDeleted;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc b/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc
index 9cb2e69..cab9918 100644
--- a/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc
+++ b/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc
@@ -151,7 +151,7 @@
if (query == u"50+94/5") {
return ash::assistant::LauncherSearchIphQueryType::kCalculation;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ash/app_list/search/keyboard_shortcut_result.cc b/chrome/browser/ash/app_list/search/keyboard_shortcut_result.cc
index b8057e45..12438d6 100644
--- a/chrome/browser/ash/app_list/search/keyboard_shortcut_result.cc
+++ b/chrome/browser/ash/app_list/search/keyboard_shortcut_result.cc
@@ -248,7 +248,7 @@
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;
diff --git a/chrome/browser/ash/app_mode/app_launch_utils.cc b/chrome/browser/ash/app_mode/app_launch_utils.cc
index 3eff0f57..ddd84995 100644
--- a/chrome/browser/ash/app_mode/app_launch_utils.cc
+++ b/chrome/browser/ash/app_mode/app_launch_utils.cc
@@ -165,7 +165,7 @@
local_state.CommitPendingWrite();
return;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace ash
diff --git a/chrome/browser/ash/app_mode/kiosk_controller_impl.cc b/chrome/browser/ash/app_mode/kiosk_controller_impl.cc
index 22ae161..6edd215 100644
--- a/chrome/browser/ash/app_mode/kiosk_controller_impl.cc
+++ b/chrome/browser/ash/app_mode/kiosk_controller_impl.cc
@@ -89,7 +89,7 @@
/*icon=*/gfx::ImageSkia(),
/*url=*/GURL()};
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ash/app_mode/load_profile.cc b/chrome/browser/ash/app_mode/load_profile.cc
index c4e0033..2992bea3 100644
--- a/chrome/browser/ash/app_mode/load_profile.cc
+++ b/chrome/browser/ash/app_mode/load_profile.cc
@@ -166,7 +166,7 @@
}
void OnOldEncryptionDetected(std::unique_ptr<UserContext> user_context,
bool has_incomplete_migration) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ResultCallback on_done_;
@@ -367,7 +367,7 @@
return self->ReturnError(
LoginFailureToKioskLaunchError(*auth_failure));
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
},
// Safe because `this` owns `current_step_`
base::Unretained(this)));
diff --git a/chrome/browser/ash/borealis/borealis_installer_impl.cc b/chrome/browser/ash/borealis/borealis_installer_impl.cc
index 831ce5db..04e5518 100644
--- a/chrome/browser/ash/borealis/borealis_installer_impl.cc
+++ b/chrome/browser/ash/borealis/borealis_installer_impl.cc
@@ -159,7 +159,7 @@
"Unexpected DLC failure, please file feedback."};
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// As part of its installation we perform a dry run of borealis. This ensures
diff --git a/chrome/browser/ash/calendar/calendar_keyed_service_unittest.cc b/chrome/browser/ash/calendar/calendar_keyed_service_unittest.cc
index d1d9d22..8fc6d50 100644
--- a/chrome/browser/ash/calendar/calendar_keyed_service_unittest.cc
+++ b/chrome/browser/ash/calendar/calendar_keyed_service_unittest.cc
@@ -123,7 +123,7 @@
google_apis::test_util::GetTestFilePath(
"calendar/group_calendar_events.json"));
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
content::BrowserTaskEnvironment task_environment_{
diff --git a/chrome/browser/ash/crosapi/cec_private_ash.cc b/chrome/browser/ash/crosapi/cec_private_ash.cc
index c2bd2f6..18bc141 100644
--- a/chrome/browser/ash/crosapi/cec_private_ash.cc
+++ b/chrome/browser/ash/crosapi/cec_private_ash.cc
@@ -31,7 +31,7 @@
return PowerState::kUnknown;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ash/crosapi/network_settings_service_ash.cc b/chrome/browser/ash/crosapi/network_settings_service_ash.cc
index cc0a091..c5a370d8 100644
--- a/chrome/browser/ash/crosapi/network_settings_service_ash.cc
+++ b/chrome/browser/ash/crosapi/network_settings_service_ash.cc
@@ -64,14 +64,14 @@
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.";
diff --git a/chrome/browser/ash/events/event_rewriter_delegate_impl.cc b/chrome/browser/ash/events/event_rewriter_delegate_impl.cc
index e708cd6..6aec6e5 100644
--- a/chrome/browser/ash/events/event_rewriter_delegate_impl.cc
+++ b/chrome/browser/ash/events/event_rewriter_delegate_impl.cc
@@ -288,7 +288,7 @@
case ui::KeyboardCode::VKEY_INSERT:
return settings->six_pack_key_remappings->insert;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ash/file_system_provider/cloud_file_system.cc b/chrome/browser/ash/file_system_provider/cloud_file_system.cc
index 51398cfa..89ac6ff 100644
--- a/chrome/browser/ash/file_system_provider/cloud_file_system.cc
+++ b/chrome/browser/ash/file_system_provider/cloud_file_system.cc
@@ -58,7 +58,7 @@
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 @@
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) {
diff --git a/chrome/browser/ash/fileapi/diversion_backend_delegate.cc b/chrome/browser/ash/fileapi/diversion_backend_delegate.cc
index 55ef2fb..e17b040 100644
--- a/chrome/browser/ash/fileapi/diversion_backend_delegate.cc
+++ b/chrome/browser/ash/fileapi/diversion_backend_delegate.cc
@@ -565,7 +565,7 @@
switch (call_site) {
case OnDiversionFinishedCallSite::kEnsureFileExists:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case OnDiversionFinishedCallSite::kCopyFileLocal: {
if (!scoped_fd.is_valid()) {
diff --git a/chrome/browser/ash/fileapi/diversion_backend_delegate_unittest.cc b/chrome/browser/ash/fileapi/diversion_backend_delegate_unittest.cc
index 7b77f21..97d4f0f6 100644
--- a/chrome/browser/ash/fileapi/diversion_backend_delegate_unittest.cc
+++ b/chrome/browser/ash/fileapi/diversion_backend_delegate_unittest.cc
@@ -161,7 +161,7 @@
storage::WatcherManager* GetWatcherManager(
storage::FileSystemType type) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
diff --git a/chrome/browser/ash/fileapi/diversion_file_manager_unittest.cc b/chrome/browser/ash/fileapi/diversion_file_manager_unittest.cc
index bf06f1a..2ff4ee5 100644
--- a/chrome/browser/ash/fileapi/diversion_file_manager_unittest.cc
+++ b/chrome/browser/ash/fileapi/diversion_file_manager_unittest.cc
@@ -165,7 +165,7 @@
[](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),
diff --git a/chrome/browser/ash/input_method/editor_text_query_provider.cc b/chrome/browser/ash/input_method/editor_text_query_provider.cc
index 15697ab5..7b7610a7 100644
--- a/chrome/browser/ash/input_method/editor_text_query_provider.cc
+++ b/chrome/browser/ash/input_method/editor_text_query_provider.cc
@@ -100,7 +100,7 @@
case manta::MantaStatusCode::kRestrictedCountry:
return orca::mojom::TextQueryErrorCode::kRestrictedRegion;
case manta::MantaStatusCode::kOk:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
index 695de370..5c462d9 100644
--- a/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
+++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
@@ -255,7 +255,7 @@
CASE(kLacrosDataMigrationStarted);
CASE(kLacrosBackwardDataMigrationStarted);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
#undef CASE
}
@@ -602,7 +602,7 @@
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
diff --git a/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc b/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc
index c6f9ced..a4c65cc 100644
--- a/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc
+++ b/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc
@@ -305,7 +305,7 @@
return app;
}
}
- NOTREACHED_NORETURN() << "App not in KioskController: " << test_app_id();
+ NOTREACHED() << "App not in KioskController: " << test_app_id();
}
} // namespace ash
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
index c721e7a..0842081 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
+++ b/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
@@ -644,7 +644,7 @@
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:
diff --git a/chrome/browser/ash/login/security_token_session_controller.cc b/chrome/browser/ash/login/security_token_session_controller.cc
index 64154aa7..fa665ba 100644
--- a/chrome/browser/ash/login/security_token_session_controller.cc
+++ b/chrome/browser/ash/login/security_token_session_controller.cc
@@ -105,7 +105,7 @@
case SecurityTokenSessionController::Behavior::kLock:
return std::string(kLockPrefValue);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Checks if `domain` represents a valid domain. Returns false if `domain` is
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc b/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc
index b1af57a..03587f2 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc
@@ -131,7 +131,7 @@
}
break;
case AccountType::ACTIVE_DIRECTORY:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
const ProfileRequiresPolicy requires_policy_user_property =
diff --git a/chrome/browser/ash/policy/dlp/files_policy_notification_manager_unittest.cc b/chrome/browser/ash/policy/dlp/files_policy_notification_manager_unittest.cc
index 1c689d32..e72f81c6 100644
--- a/chrome/browser/ash/policy/dlp/files_policy_notification_manager_unittest.cc
+++ b/chrome/browser/ash/policy/dlp/files_policy_notification_manager_unittest.cc
@@ -117,7 +117,7 @@
// return a generic reason.
return FilesPolicyDialog::BlockReason::kEnterpriseConnectors;
case file_manager::io_task::PolicyErrorType::kDlpWarningTimeout:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_config.cc b/chrome/browser/ash/policy/enrollment/enrollment_config.cc
index 1fa3382..2969b74 100644
--- a/chrome/browser/ash/policy/enrollment/enrollment_config.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_config.cc
@@ -106,7 +106,7 @@
CASE(MODE_ENROLLMENT_TOKEN_INITIAL_MANUAL_FALLBACK);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
#undef CASE
}
@@ -122,7 +122,7 @@
CASE(AUTH_MECHANISM_TOKEN_PREFERRED);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
#undef CASE
}
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
index 7ae9344..a7708d8 100644
--- a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
@@ -75,7 +75,7 @@
EnrollmentConfig::Mode mode) {
switch (mode) {
case EnrollmentConfig::MODE_NONE:
- NOTREACHED_NORETURN() << "Bad enrollment mode: " << mode;
+ NOTREACHED() << "Bad enrollment mode: " << mode;
case EnrollmentConfig::MODE_MANUAL:
return em::DeviceRegisterRequest::FLAVOR_ENROLLMENT_MANUAL;
case EnrollmentConfig::MODE_MANUAL_REENROLLMENT:
diff --git a/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc
index 278253c7..d7d1524 100644
--- a/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc
@@ -163,7 +163,7 @@
case ErrorCode::NO_COMMON_AUTH_METHOD:
return ExtendedStartCrdSessionResultCode::kFailureNoCommonAuthMethod;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
StartCrdSessionResultCode ToStartCrdSessionResultCode(
@@ -214,7 +214,7 @@
// 'FAILURE_CRD_HOST_ERROR`.
return StartCrdSessionResultCode::FAILURE_CRD_HOST_ERROR;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
base::TimeDelta GetDeviceIdleTime() {
diff --git a/chrome/browser/ash/policy/reporting/event_based_logs/event_based_log_manager.cc b/chrome/browser/ash/policy/reporting/event_based_logs/event_based_log_manager.cc
index 9adb723..9193ed2 100644
--- a/chrome/browser/ash/policy/reporting/event_based_logs/event_based_log_manager.cc
+++ b/chrome/browser/ash/policy/reporting/event_based_logs/event_based_log_manager.cc
@@ -81,7 +81,7 @@
case ash::reporting::TRIGGER_EVENT_TYPE_UNSPECIFIED:
continue;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/chrome_fatal_crash_events_observer.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/chrome_fatal_crash_events_observer.cc
index 0fd0547..36a56364 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/chrome_fatal_crash_events_observer.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/chrome_fatal_crash_events_observer.cc
@@ -47,8 +47,8 @@
case CrashEventInfo::CrashType::kUnknown:
[[fallthrough]];
default: // Other types added by healthD that are unknown here yet.
- NOTREACHED_NORETURN()
- << "Encountered unhandled or unknown crash type " << crash_type;
+ NOTREACHED() << "Encountered unhandled or unknown crash type "
+ << crash_type;
}
}
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer.cc
index 7349cc1..df677a1 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer.cc
@@ -74,7 +74,7 @@
case user_manager::UserType::kWebKioskApp:
return FatalCrashTelemetry::SESSION_TYPE_WEB_KIOSK_APP;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -328,8 +328,8 @@
case CrashEventInfo::CrashType::kUnknown:
[[fallthrough]];
default: // Other types added by healthD that are unknown here yet.
- NOTREACHED_NORETURN()
- << "Encountered unhandled or unknown crash type " << crash_type;
+ NOTREACHED() << "Encountered unhandled or unknown crash type "
+ << crash_type;
}
}
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer_unittest.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer_unittest.cc
index 7fbfb78a..37c882f 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer_unittest.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/fatal_crash/fatal_crash_events_observer_unittest.cc
@@ -313,7 +313,7 @@
expected_crash_type = FatalCrashTelemetry::CRASH_TYPE_CHROME;
break;
default: // Crash types that are not tested but should be tested.
- NOTREACHED_NORETURN() << "Encountered untested crash type " << type();
+ NOTREACHED() << "Encountered untested crash type " << type();
}
EXPECT_EQ(fatal_crash_telemetry.type(), expected_crash_type);
}
diff --git a/chrome/browser/ash/policy/skyvault/migration_notification_manager.cc b/chrome/browser/ash/policy/skyvault/migration_notification_manager.cc
index 349ec3d0..526f83a 100644
--- a/chrome/browser/ash/policy/skyvault/migration_notification_manager.cc
+++ b/chrome/browser/ash/policy/skyvault/migration_notification_manager.cc
@@ -81,7 +81,7 @@
return l10n_util::GetStringUTF16(
IDS_POLICY_SKYVAULT_CLOUD_PROVIDER_ONEDRIVE);
case CloudProvider::kNotSpecified:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ash/policy/skyvault/migration_notification_manager_browsertest.cc b/chrome/browser/ash/policy/skyvault/migration_notification_manager_browsertest.cc
index c9d539c..8135719 100644
--- a/chrome/browser/ash/policy/skyvault/migration_notification_manager_browsertest.cc
+++ b/chrome/browser/ash/policy/skyvault/migration_notification_manager_browsertest.cc
@@ -44,7 +44,7 @@
case CloudProvider::kOneDrive:
return "one_drive";
case CloudProvider::kNotSpecified:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ash/privacy_hub/privacy_hub_util.cc b/chrome/browser/ash/privacy_hub/privacy_hub_util.cc
index f3e9daa..1b5c884 100644
--- a/chrome/browser/ash/privacy_hub/privacy_hub_util.cc
+++ b/chrome/browser/ash/privacy_hub/privacy_hub_util.cc
@@ -229,7 +229,7 @@
case Sensor::kLocation:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
diff --git a/chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc b/chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc
index 52e2adb2..4dd2888 100644
--- a/chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc
+++ b/chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc
@@ -233,7 +233,7 @@
case BubbleIcon::kGooglePhotosIcon:
return IDR_SCALABLE_IPH_GOOGLE_PHOTOS_ICON_120_PNG;
case BubbleIcon::kNoIcon:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#else
return IDR_PRODUCT_LOGO_128;
diff --git a/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc b/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc
index 51ec17a..0b2f300 100644
--- a/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc
+++ b/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc
@@ -42,7 +42,7 @@
case lorgnette::MODE_UNSPECIFIED:
case ProtoColorMode::ColorMode_INT_MIN_SENTINEL_DO_NOT_USE_:
case ProtoColorMode::ColorMode_INT_MAX_SENTINEL_DO_NOT_USE_:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -67,7 +67,7 @@
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::string GetImageFormatString(ProtoImageFormat img_format) {
@@ -78,7 +78,7 @@
return "jpeg";
case lorgnette::ImageFormat_INT_MIN_SENTINEL_DO_NOT_USE_:
case lorgnette::ImageFormat_INT_MAX_SENTINEL_DO_NOT_USE_:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ash/system_logs/device_data_manager_input_devices_log_source.cc b/chrome/browser/ash/system_logs/device_data_manager_input_devices_log_source.cc
index 8ae93bb..e28a726 100644
--- a/chrome/browser/ash/system_logs/device_data_manager_input_devices_log_source.cc
+++ b/chrome/browser/ash/system_logs/device_data_manager_input_devices_log_source.cc
@@ -33,7 +33,7 @@
case ui::INPUT_DEVICE_UNKNOWN:
return "unknown";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
constexpr ui::InputDeviceType kDeviceTypeList[] = {
@@ -67,7 +67,7 @@
case kUncategorizedDevices:
return os << "uncategorized";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::string DescribeDisplayCalibrationPoint(
diff --git a/chrome/browser/ash/system_logs/keyboard_info_log_source.cc b/chrome/browser/ash/system_logs/keyboard_info_log_source.cc
index e24e10c7..e766f370 100644
--- a/chrome/browser/ash/system_logs/keyboard_info_log_source.cc
+++ b/chrome/browser/ash/system_logs/keyboard_info_log_source.cc
@@ -39,7 +39,7 @@
case DeviceType::kDeviceVirtualCoreKeyboard:
return "Virtual Core Keyboard";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index c7b9d3f..ed58061 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -772,7 +772,7 @@
iban->set_record_type(Iban::RecordType::kLocalIban);
} else {
// Support for server IBANs isn't available yet on Android.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc
index 2c55b92d..95ca74a9 100644
--- a/chrome/browser/banners/app_banner_manager_browsertest.cc
+++ b/chrome/browser/banners/app_banner_manager_browsertest.cc
@@ -137,7 +137,7 @@
const GURL& validated_url,
const blink::mojom::Manifest& manifest,
NativeCheckCallback callback) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void OnWebAppInstallableCheckedNoErrors(
diff --git a/chrome/browser/banners/app_banner_manager_desktop.cc b/chrome/browser/banners/app_banner_manager_desktop.cc
index 7be7678..57aae6f 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/app_banner_manager_desktop.cc
@@ -121,7 +121,7 @@
const GURL& validated_url,
const blink::mojom::Manifest& manifest,
NativeCheckCallback callback) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void AppBannerManagerDesktop::OnWebAppInstallableCheckedNoErrors(
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
index af7f966..034e870 100644
--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -521,7 +521,7 @@
: nullptr;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ScopedJavaLocalRef<jobject> BookmarkBridge::GetRootFolderId(JNIEnv* env) {
@@ -1727,7 +1727,7 @@
return local_or_syncable_reading_list_manager_.get();
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void BookmarkBridge::ReadingListModelLoaded(const ReadingListModel* model) {
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc
index 9538535..d81be5f 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_model_delegate.cc
@@ -217,7 +217,7 @@
case StorageType::kMediaDeviceSalt:
return false;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
index bd2f6446..1c12bb3 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -1026,7 +1026,7 @@
void SetEnterpriseReportingEndpoints(
const base::flat_map<std::string, GURL>& endpoints) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void SendReportsAndRemoveSource(
@@ -4945,7 +4945,7 @@
content_settings::ProviderType::kPrefProvider, /*incognito=*/false,
GetMetadata());
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
};
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api.cc b/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api.cc
index ae07254..f4f97b0bc 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api.cc
@@ -61,7 +61,7 @@
return base::ok(std::move(info));
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool IsPendingApprovalRoutine(
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api_converters.cc b/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api_converters.cc
index 5fd2c0f..afa7863 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api_converters.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/diagnostics/diagnostics_api_converters.cc
@@ -130,7 +130,7 @@
OutputT ConvertExtensionUnionToMojoUnion(const Arg& arg) {
static_assert(
false, "ConvertExtensionUnionToMojoUnion for specific type not defined.");
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::vector<RoutineInquiryReplyField> GetNonNullFields(
@@ -321,7 +321,7 @@
case cx_diag::RoutineCommandType::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
crosapi::DiagnosticsAcPowerStatusEnum ConvertAcPowerStatusRoutineType(
@@ -334,7 +334,7 @@
case cx_diag::AcPowerStatus::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_diag::UserMessageType ConvertRoutineUserMessage(
@@ -361,7 +361,7 @@
case cx_diag::DiskReadRoutineType::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
crosapi::DiagnosticsNvmeSelfTestTypeEnum ConvertNvmeSelfTestRoutineType(
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/events/event_manager.cc b/chrome/browser/chromeos/extensions/telemetry/api/events/event_manager.cc
index 9e94395b..34e2b24 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/events/event_manager.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/events/event_manager.cc
@@ -66,7 +66,7 @@
case crosapi::TelemetryEventCategoryEnum::kStylusConnected:
return "os.events.onStylusConnectedEvent";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/events/events_api_converters.cc b/chrome/browser/chromeos/extensions/telemetry/api/events/events_api_converters.cc
index e609969..f5a82aa 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/events/events_api_converters.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/events/events_api_converters.cc
@@ -262,7 +262,7 @@
case crosapi::TelemetryAudioJackEventInfo_State::kRemove:
return cx_events::AudioJackEvent::kDisconnected;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::AudioJackDeviceType Convert(
@@ -275,7 +275,7 @@
case crosapi::TelemetryAudioJackEventInfo_DeviceType::kMicrophone:
return cx_events::AudioJackDeviceType::kMicrophone;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::KeyboardConnectionType Convert(
@@ -292,7 +292,7 @@
case crosapi::TelemetryKeyboardConnectionType::kUnknown:
return cx_events::KeyboardConnectionType::kUnknown;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::PhysicalKeyboardLayout Convert(
@@ -305,7 +305,7 @@
case crosapi::TelemetryKeyboardPhysicalLayout::kChromeOS:
return cx_events::PhysicalKeyboardLayout::kChromeOs;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::MechanicalKeyboardLayout Convert(
@@ -322,7 +322,7 @@
case crosapi::TelemetryKeyboardMechanicalLayout::kJis:
return cx_events::MechanicalKeyboardLayout::kJis;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::KeyboardNumberPadPresence Convert(
@@ -337,7 +337,7 @@
case crosapi::TelemetryKeyboardNumberPadPresence::kNotPresent:
return cx_events::KeyboardNumberPadPresence::kNotPresent;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::KeyboardTopRowKey Convert(
@@ -392,7 +392,7 @@
case crosapi::TelemetryKeyboardTopRowKey::kDelete:
return cx_events::KeyboardTopRowKey::kDelete;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::KeyboardTopRightKey Convert(
@@ -409,7 +409,7 @@
case crosapi::TelemetryKeyboardTopRightKey::kControlPanel:
return cx_events::KeyboardTopRightKey::kControlPanel;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::LidEvent Convert(crosapi::TelemetryLidEventInfo::State state) {
@@ -421,7 +421,7 @@
case crosapi::TelemetryLidEventInfo_State::kOpened:
return cx_events::LidEvent::kOpened;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::UsbEvent Convert(crosapi::TelemetryUsbEventInfo::State state) {
@@ -433,7 +433,7 @@
case crosapi::TelemetryUsbEventInfo_State::kRemove:
return cx_events::UsbEvent::kDisconnected;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::ExternalDisplayEvent Convert(
@@ -446,7 +446,7 @@
case crosapi::TelemetryExternalDisplayEventInfo_State::kRemove:
return cx_events::ExternalDisplayEvent::kDisconnected;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::SdCardEvent Convert(crosapi::TelemetrySdCardEventInfo::State state) {
@@ -458,7 +458,7 @@
case crosapi::TelemetrySdCardEventInfo_State::kRemove:
return cx_events::SdCardEvent::kDisconnected;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::PowerEvent Convert(crosapi::TelemetryPowerEventInfo::State state) {
@@ -474,7 +474,7 @@
case crosapi::TelemetryPowerEventInfo_State::kOsResume:
return cx_events::PowerEvent::kOsResume;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::StylusGarageEvent Convert(
@@ -487,7 +487,7 @@
case crosapi::TelemetryStylusGarageEventInfo_State::kRemoved:
return cx_events::StylusGarageEvent::kRemoved;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::InputTouchButton Convert(crosapi::TelemetryInputTouchButton button) {
@@ -501,7 +501,7 @@
case crosapi::TelemetryInputTouchButton::kRight:
return cx_events::InputTouchButton::kRight;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
crosapi::TelemetryEventCategoryEnum Convert(cx_events::EventCategory input) {
@@ -539,7 +539,7 @@
case cx_events::EventCategory::kStylusConnected:
return crosapi::TelemetryEventCategoryEnum::kStylusConnected;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::InputTouchButtonState Convert(
@@ -552,7 +552,7 @@
case crosapi::TelemetryTouchpadButtonEventInfo_State::kReleased:
return cx_events::InputTouchButtonState::kReleased;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_events::DisplayInputType Convert(crosapi::ProbeDisplayInputType input) {
@@ -564,7 +564,7 @@
case crosapi::ProbeDisplayInputType::kAnalog:
return cx_events::DisplayInputType::kAnalog;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int Convert(uint32_t input) {
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/events/remote_event_service_strategy.cc b/chrome/browser/chromeos/extensions/telemetry/api/events/remote_event_service_strategy.cc
index 31ce8b23..ea45d055c 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/events/remote_event_service_strategy.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/events/remote_event_service_strategy.cc
@@ -73,7 +73,7 @@
}
return std::make_unique<RemoteEventServiceStrategyLacros>();
#else // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_converters.cc b/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_converters.cc
index 9245630..d109445 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_converters.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_converters.cc
@@ -296,7 +296,7 @@
kWaitingForInteraction:
return cx_diag::RoutineWaitingReason::kWaitingForInteraction;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_diag::MemtesterTestItemEnum Convert(
@@ -344,7 +344,7 @@
case crosapi::TelemetryDiagnosticMemtesterTestItemEnum::kSixteenBitWrites:
return cx_diag::MemtesterTestItemEnum::kSixteenBitWrites;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_diag::HardwarePresenceStatus Convert(
@@ -359,7 +359,7 @@
case crosapi::TelemetryDiagnosticHardwarePresenceStatus::kNotConfigured:
return cx_diag::HardwarePresenceStatus::kNotConfigured;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_diag::NetworkBandwidthRoutineRunningType Convert(
@@ -376,7 +376,7 @@
kUpload:
return cx_diag::NetworkBandwidthRoutineRunningType::kUpload;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_diag::CameraFrameAnalysisIssue Convert(
@@ -398,7 +398,7 @@
kLensAreDirty:
return cx_diag::CameraFrameAnalysisIssue::kLensAreDirty;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_diag::CameraSubtestResult Convert(
@@ -413,7 +413,7 @@
case crosapi::TelemetryDiagnosticCameraSubtestResult::kFailed:
return cx_diag::CameraSubtestResult::kFailed;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace chromeos::converters::routines
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_observation.cc b/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_observation.cc
index 575b44ae..bf5282f 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_observation.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/routines/diagnostic_routine_observation.cc
@@ -89,7 +89,7 @@
// No need to support legacy finished events for newer routines.
return nullptr;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<extensions::Event> GetEventForFinishedRoutine(
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/routines/remote_diagnostic_routines_service_strategy.cc b/chrome/browser/chromeos/extensions/telemetry/api/routines/remote_diagnostic_routines_service_strategy.cc
index f656bcd4..f4099e96 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/routines/remote_diagnostic_routines_service_strategy.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/routines/remote_diagnostic_routines_service_strategy.cc
@@ -81,7 +81,7 @@
}
return std::make_unique<RemoteDiagnosticRoutineServiceStrategyLacros>();
#else // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/telemetry/telemetry_api_converters.cc b/chrome/browser/chromeos/extensions/telemetry/api/telemetry/telemetry_api_converters.cc
index 5f3a8d0..f712d23a 100644
--- a/chrome/browser/chromeos/extensions/telemetry/api/telemetry/telemetry_api_converters.cc
+++ b/chrome/browser/chromeos/extensions/telemetry/api/telemetry/telemetry_api_converters.cc
@@ -500,7 +500,7 @@
case crosapi::ProbeCpuArchitectureEnum::kArmv7l:
return cx_telem::CpuArchitectureEnum::kArmv7l;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::NetworkState Convert(
@@ -523,7 +523,7 @@
case network_health::mojom::NetworkState::kOnline:
return cx_telem::NetworkState::kOnline;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::NetworkType Convert(
@@ -550,7 +550,7 @@
case network_config::mojom::NetworkType::kWiFi:
return cx_telem::NetworkType::kWifi;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::TpmGSCVersion Convert(crosapi::ProbeTpmGSCVersion input) {
@@ -562,7 +562,7 @@
case crosapi::ProbeTpmGSCVersion::kTi50:
return cx_telem::TpmGSCVersion::kTi50;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::FwupdVersionFormat Convert(crosapi::ProbeFwupdVersionFormat input) {
@@ -594,7 +594,7 @@
case crosapi::ProbeFwupdVersionFormat::kHex:
return cx_telem::FwupdVersionFormat::kHex;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::UsbVersion Convert(crosapi::ProbeUsbVersion input) {
@@ -608,7 +608,7 @@
case crosapi::ProbeUsbVersion::kUsb3:
return cx_telem::UsbVersion::kUsb3;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::UsbSpecSpeed Convert(crosapi::ProbeUsbSpecSpeed input) {
@@ -628,7 +628,7 @@
case crosapi::ProbeUsbSpecSpeed::k20Gbps:
return cx_telem::UsbSpecSpeed::kN20Gbps;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::DisplayInputType Convert(crosapi::ProbeDisplayInputType input) {
@@ -640,7 +640,7 @@
case crosapi::ProbeDisplayInputType::kAnalog:
return cx_telem::DisplayInputType::kAnalog;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
cx_telem::ThermalSensorSource Convert(crosapi::ProbeThermalSensorSource input) {
@@ -652,7 +652,7 @@
case crosapi::ProbeThermalSensorSource::kSysFs:
return cx_telem::ThermalSensorSource::kSysFs;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace chromeos::converters::telemetry
diff --git a/chrome/browser/device_notifications/device_connection_tracker.cc b/chrome/browser/device_notifications/device_connection_tracker.cc
index f788219..631b0e9 100644
--- a/chrome/browser/device_notifications/device_connection_tracker.cc
+++ b/chrome/browser/device_notifications/device_connection_tracker.cc
@@ -39,7 +39,7 @@
return extension->name();
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/device_notifications/device_pinned_notification_renderer.cc b/chrome/browser/device_notifications/device_pinned_notification_renderer.cc
index 08327c14..997545bd 100644
--- a/chrome/browser/device_notifications/device_pinned_notification_renderer.cc
+++ b/chrome/browser/device_notifications/device_pinned_notification_renderer.cc
@@ -43,7 +43,7 @@
static_cast<int>(extension_names.size()), extension_names[0],
extension_names[1], static_cast<int>(extension_names.size() - 2));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
diff --git a/chrome/browser/device_notifications/device_status_icon_renderer.cc b/chrome/browser/device_notifications/device_status_icon_renderer.cc
index 5543cf50..bf0d490 100644
--- a/chrome/browser/device_notifications/device_status_icon_renderer.cc
+++ b/chrome/browser/device_notifications/device_status_icon_renderer.cc
@@ -50,7 +50,7 @@
connection_count, base::UTF8ToUTF16(name));
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/device_notifications/device_status_icon_unittest.cc b/chrome/browser/device_notifications/device_status_icon_unittest.cc
index 4c83c8c6..60a9359 100644
--- a/chrome/browser/device_notifications/device_status_icon_unittest.cc
+++ b/chrome/browser/device_notifications/device_status_icon_unittest.cc
@@ -45,7 +45,7 @@
(connection_count <= 1 ? "device" : "devices")));
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
class MockStatusIcon : public StatusIcon {
diff --git a/chrome/browser/device_notifications/device_system_tray_icon_unittest.cc b/chrome/browser/device_notifications/device_system_tray_icon_unittest.cc
index a6d516c2..02f6f1d1 100644
--- a/chrome/browser/device_notifications/device_system_tray_icon_unittest.cc
+++ b/chrome/browser/device_notifications/device_system_tray_icon_unittest.cc
@@ -52,7 +52,7 @@
return extension->name();
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/device_reauth/win/authenticator_win.cc b/chrome/browser/device_reauth/win/authenticator_win.cc
index d9ab1ab..e50850c 100644
--- a/chrome/browser/device_reauth/win/authenticator_win.cc
+++ b/chrome/browser/device_reauth/win/authenticator_win.cc
@@ -225,7 +225,7 @@
case AuthenticationResultStatusWin::kFailedToFindBrowser:
case AuthenticationResultStatusWin::kFailedToFindHWNDForNativeWindow:
// This values are not returned by UserConsentVerifier API.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/digital_credentials/digital_identity_fido_handler_observer.cc b/chrome/browser/digital_credentials/digital_identity_fido_handler_observer.cc
index 945b76e..c521d740 100644
--- a/chrome/browser/digital_credentials/digital_identity_fido_handler_observer.cc
+++ b/chrome/browser/digital_credentials/digital_identity_fido_handler_observer.cc
@@ -60,7 +60,7 @@
void DigitalIdentityFidoHandlerObserver::CollectPIN(
CollectPINOptions options,
base::OnceCallback<void(std::u16string)> provide_pin_cb) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void DigitalIdentityFidoHandlerObserver::FinishCollectToken() {}
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index 7105e20f..ba5abfe 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -1026,7 +1026,7 @@
if (state == DownloadItem::CANCELLED || state == DownloadItem::INTERRUPTED) {
return DangerUiPattern::kOther;
} else if (state == DownloadItem::MAX_DOWNLOAD_STATE) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
switch (GetInsecureDownloadStatus()) {
diff --git a/chrome/browser/enterprise/data_controls/chrome_dlp_rules_manager.cc b/chrome/browser/enterprise/data_controls/chrome_dlp_rules_manager.cc
index 245b9d4..896b4f5 100644
--- a/chrome/browser/enterprise/data_controls/chrome_dlp_rules_manager.cc
+++ b/chrome/browser/enterprise/data_controls/chrome_dlp_rules_manager.cc
@@ -302,7 +302,7 @@
// Not supported on non-CrOS platforms, see
// `DlpRulesManagerImpl::OnDataLeakPreventionRulesUpdate()` for the CrOS
// implementation.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace data_controls
diff --git a/chrome/browser/enterprise/platform_auth/extensible_enterprise_sso_provider_mac.mm b/chrome/browser/enterprise/platform_auth/extensible_enterprise_sso_provider_mac.mm
index 1eee4b0..47f95e38 100644
--- a/chrome/browser/enterprise/platform_auth/extensible_enterprise_sso_provider_mac.mm
+++ b/chrome/browser/enterprise/platform_auth/extensible_enterprise_sso_provider_mac.mm
@@ -172,7 +172,7 @@
void ExtensibleEnterpriseSSOProvider::FetchOrigins(
FetchOriginsCallback on_fetch_complete) {
// Origin filtering is nor supported.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ExtensibleEnterpriseSSOProvider::GetData(
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
index 32fa41ab..9d4ddcea 100644
--- a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
+++ b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
@@ -917,7 +917,7 @@
// This Autofill private API is only available on desktop systems and
// IsPaymentMethodsMandatoryReauthEnabled() ensures that it's only enabled
// for MacOS and Windows.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
} else {
ReturnCreditCard();
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index f0ba9c2..a93f3b4 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -2840,7 +2840,7 @@
experiment_manager->GetCurrentExperimentStage();
switch (experiment_stage) {
case MV2ExperimentStage::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case MV2ExperimentStage::kWarning: {
// Immediately dismiss the notice.
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
index a3163929..5f58d8b 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -144,7 +144,7 @@
return l10n_util::GetStringUTF16(
IDS_PASSWORDS_PAGE_EDIT_AUTHENTICATION_PROMPT_BIOMETRIC_SUFFIX);
case extensions::api::passwords_private::PlaintextReason::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#elif BUILDFLAG(IS_WIN)
switch (reason) {
@@ -158,7 +158,7 @@
return l10n_util::GetStringUTF16(
IDS_PASSWORDS_PAGE_EDIT_AUTHENTICATION_PROMPT);
case extensions::api::passwords_private::PlaintextReason::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#else
return std::u16string();
diff --git a/chrome/browser/extensions/api/scripting/scripting_api.cc b/chrome/browser/extensions/api/scripting/scripting_api.cc
index 017c7dd..6a53447 100644
--- a/chrome/browser/extensions/api/scripting/scripting_api.cc
+++ b/chrome/browser/extensions/api/scripting/scripting_api.cc
@@ -529,13 +529,12 @@
[](api::extension_types::ExecutionWorld world) {
switch (world) {
case api::extension_types::ExecutionWorld::kNone:
- NOTREACHED_NORETURN()
+ NOTREACHED()
<< "Execution world should always be present in serialization.";
case api::extension_types::ExecutionWorld::kIsolated:
return api::scripting::ExecutionWorld::kIsolated;
case api::extension_types::ExecutionWorld::kUserScript:
- NOTREACHED_NORETURN()
- << "ISOLATED worlds are not supported in this API.";
+ NOTREACHED() << "ISOLATED worlds are not supported in this API.";
case api::extension_types::ExecutionWorld::kMain:
return api::scripting::ExecutionWorld::kMain;
}
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index e4dfe07..10fe7f6 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -653,7 +653,7 @@
manifest_version_counts = &unpacked_manifest_version_counts;
break;
case mojom::ManifestLocation::kInvalidLocation:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
base::UmaHistogramExactLinear(location_histogram_name,
extension->manifest_version(),
diff --git a/chrome/browser/extensions/manifest_v2_experiment_manager.cc b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
index 55d3291..78ec98d 100644
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -58,7 +58,7 @@
case mojom::ManifestLocation::kInternal:
return "Internal";
case mojom::ManifestLocation::kInvalidLocation:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -163,7 +163,7 @@
switch (experiment_stage) {
case MV2ExperimentStage::kNone:
// There is no notice for this stage, thus it cannot be acknowledged.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case MV2ExperimentStage::kWarning:
return kMV2DeprecationExtensionWarningAcknowledgedPref;
case MV2ExperimentStage::kDisableWithReEnable:
@@ -178,7 +178,7 @@
switch (experiment_stage) {
case MV2ExperimentStage::kNone:
// There is no notice for this stage, thus it cannot be acknowledged.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case MV2ExperimentStage::kWarning:
return kMV2DeprecationWarningAcknowledgedGloballyPref;
case MV2ExperimentStage::kDisableWithReEnable:
diff --git a/chrome/browser/extensions/manifest_v2_experiment_manager_browsertest.cc b/chrome/browser/extensions/manifest_v2_experiment_manager_browsertest.cc
index c089c49..a66d1aac 100644
--- a/chrome/browser/extensions/manifest_v2_experiment_manager_browsertest.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager_browsertest.cc
@@ -98,7 +98,7 @@
}
}
- NOTREACHED_NORETURN()
+ NOTREACHED()
<< "Unknown test name '" << test_name << "'. "
<< "You need to add a new test stage entry into this collection.";
}
@@ -167,7 +167,7 @@
extensions_features::kExtensionManifestV2DeprecationWarning);
break;
case MV2ExperimentStage::kNone:
- NOTREACHED_NORETURN() << "Unhandled stage.";
+ NOTREACHED() << "Unhandled stage.";
}
feature_list_.InitWithFeatures(enabled_features, disabled_features);
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index 4fc6ad6..bfa9664 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -178,7 +178,7 @@
case PermissionsManager::UserSiteSetting::kGrantAllExtensions: {
// Granting access to all extensions is allowed iff feature is
// enabled, and it shouldn't be enabled anywhere where this is called.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
case PermissionsManager::UserSiteSetting::kBlockAllExtensions: {
// A reload is required if any extension that had site access will lose
diff --git a/chrome/browser/feedback/android/family_info_feedback_source_unittest.cc b/chrome/browser/feedback/android/family_info_feedback_source_unittest.cc
index 20567c5b..9270689 100644
--- a/chrome/browser/feedback/android/family_info_feedback_source_unittest.cc
+++ b/chrome/browser/feedback/android/family_info_feedback_source_unittest.cc
@@ -163,7 +163,7 @@
break;
default:
// Remaining combinations are not tested.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -301,7 +301,7 @@
EXPECT_EQ("child", GetFeedbackValue());
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc b/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc
index 42fac869..8b016dd1 100644
--- a/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc
+++ b/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc
@@ -488,7 +488,7 @@
EXPECT_FALSE(service()->ForEachEffectiveSetEntry(
[&](const net::SchemefulSite& site,
const net::FirstPartySetEntry& entry) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
return true;
}));
}
@@ -508,7 +508,7 @@
EXPECT_FALSE(service()->ForEachEffectiveSetEntry(
[&](const net::SchemefulSite& site,
const net::FirstPartySetEntry& entry) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
return true;
}));
@@ -524,7 +524,7 @@
EXPECT_FALSE(service()->ForEachEffectiveSetEntry(
[&](const net::SchemefulSite& site,
const net::FirstPartySetEntry& entry) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
return true;
}));
diff --git a/chrome/browser/hid/hid_pinned_notification_unittest.cc b/chrome/browser/hid/hid_pinned_notification_unittest.cc
index 72c505be..5af21d77 100644
--- a/chrome/browser/hid/hid_pinned_notification_unittest.cc
+++ b/chrome/browser/hid/hid_pinned_notification_unittest.cc
@@ -40,7 +40,7 @@
return l10n_util::GetPluralStringFUTF16(IDS_WEBHID_SYSTEM_TRAY_ICON_TITLE,
static_cast<int>(num_connections));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
@@ -102,7 +102,7 @@
extension_names[0].c_str(), extension_names[1].c_str(),
extension_names.size() - 2));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
};
diff --git a/chrome/browser/hid/hid_status_icon_unittest.cc b/chrome/browser/hid/hid_status_icon_unittest.cc
index dd79e07..6f21151d 100644
--- a/chrome/browser/hid/hid_status_icon_unittest.cc
+++ b/chrome/browser/hid/hid_status_icon_unittest.cc
@@ -44,7 +44,7 @@
return l10n_util::GetPluralStringFUTF16(IDS_WEBHID_SYSTEM_TRAY_ICON_TITLE,
static_cast<int>(num_connections));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
diff --git a/chrome/browser/hid/hid_system_tray_icon.cc b/chrome/browser/hid/hid_system_tray_icon.cc
index c7acd7f..49cce19 100644
--- a/chrome/browser/hid/hid_system_tray_icon.cc
+++ b/chrome/browser/hid/hid_system_tray_icon.cc
@@ -27,7 +27,7 @@
return l10n_util::GetPluralStringFUTF16(IDS_WEBHID_SYSTEM_TRAY_ICON_TITLE,
static_cast<int>(num_connections));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
diff --git a/chrome/browser/ip_protection/ip_protection_config_provider.cc b/chrome/browser/ip_protection/ip_protection_config_provider.cc
index 4dec9f8..db24879 100644
--- a/chrome/browser/ip_protection/ip_protection_config_provider.cc
+++ b/chrome/browser/ip_protection/ip_protection_config_provider.cc
@@ -448,7 +448,7 @@
exponential = true;
break;
case IpProtectionTryGetAuthTokensResult::kFailedOAuthTokenDeprecated:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Note that we calculate the backoff assuming that we've waited for
diff --git a/chrome/browser/keyboard_accessory/android/address_accessory_controller_impl.cc b/chrome/browser/keyboard_accessory/android/address_accessory_controller_impl.cc
index 46d7dbe..96298a7d 100644
--- a/chrome/browser/keyboard_accessory/android/address_accessory_controller_impl.cc
+++ b/chrome/browser/keyboard_accessory/android/address_accessory_controller_impl.cc
@@ -179,16 +179,16 @@
return;
}
default:
- NOTREACHED_NORETURN()
- << "Unhandled selected action: " << static_cast<int>(selected_action);
+ NOTREACHED() << "Unhandled selected action: "
+ << static_cast<int>(selected_action);
}
}
void AddressAccessoryControllerImpl::OnToggleChanged(
AccessoryAction toggled_action,
bool enabled) {
- NOTREACHED_NORETURN() << "Unhandled toggled action: "
- << static_cast<int>(toggled_action);
+ NOTREACHED() << "Unhandled toggled action: "
+ << static_cast<int>(toggled_action);
}
void AddressAccessoryControllerImpl::RegisterPlusProfilesProvider(
diff --git a/chrome/browser/keyboard_accessory/android/password_accessory_controller_impl.cc b/chrome/browser/keyboard_accessory/android/password_accessory_controller_impl.cc
index 0f37867..1e20bb19 100644
--- a/chrome/browser/keyboard_accessory/android/password_accessory_controller_impl.cc
+++ b/chrome/browser/keyboard_accessory/android/password_accessory_controller_impl.cc
@@ -147,7 +147,7 @@
case FocusedFieldType::kUnknown:
return ShouldShowAction(false);
}
- NOTREACHED_NORETURN() << "Showing undefined for " << focused_field_type;
+ NOTREACHED() << "Showing undefined for " << focused_field_type;
}
std::string GetOriginFromPlusProfile(
diff --git a/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl.cc b/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl.cc
index 077010f..241b42a 100644
--- a/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl.cc
+++ b/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl.cc
@@ -258,7 +258,7 @@
return;
}
- NOTREACHED_NORETURN() << "Neither fillable value nor known ID.";
+ NOTREACHED() << "Neither fillable value nor known ID.";
}
void PaymentMethodAccessoryControllerImpl::OnPasskeySelected(
diff --git a/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl_unittest.cc b/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl_unittest.cc
index 4376902..c0b297b 100644
--- a/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl_unittest.cc
+++ b/chrome/browser/keyboard_accessory/android/payment_method_accessory_controller_impl_unittest.cc
@@ -245,7 +245,7 @@
}
case CreditCard::RecordType::kFullServerCard:
// Full server cards are never unmasked, so they are not tested.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/lacros/net/network_settings_observer_browsertest.cc b/chrome/browser/lacros/net/network_settings_observer_browsertest.cc
index 1e54a27..e094a86 100644
--- a/chrome/browser/lacros/net/network_settings_observer_browsertest.cc
+++ b/chrome/browser/lacros/net/network_settings_observer_browsertest.cc
@@ -63,16 +63,14 @@
}
void SetExtensionProxy(crosapi::mojom::ProxyConfigPtr proxy_config) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
- void ClearExtensionProxy() override { NOTREACHED_NORETURN(); }
+ void ClearExtensionProxy() override { NOTREACHED(); }
void SetExtensionControllingProxyMetadata(
crosapi::mojom::ExtensionControllingProxyPtr extension) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
- void ClearExtensionControllingProxyMetadata() override {
- NOTREACHED_NORETURN();
- }
+ void ClearExtensionControllingProxyMetadata() override { NOTREACHED(); }
void SetQuitClosure(base::OnceClosure quit_closure) {
quit_closure_ = std::move(quit_closure);
diff --git a/chrome/browser/lacros/net/proxy_config_service_lacros_browsertest.cc b/chrome/browser/lacros/net/proxy_config_service_lacros_browsertest.cc
index aff98be..9a74aaf 100644
--- a/chrome/browser/lacros/net/proxy_config_service_lacros_browsertest.cc
+++ b/chrome/browser/lacros/net/proxy_config_service_lacros_browsertest.cc
@@ -69,16 +69,14 @@
// suite LacrosExtensionProxyTrackerTest whose fixture supports installing
// extension.
void SetExtensionProxy(crosapi::mojom::ProxyConfigPtr proxy_config) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
- void ClearExtensionProxy() override { NOTREACHED_NORETURN(); }
+ void ClearExtensionProxy() override { NOTREACHED(); }
void SetExtensionControllingProxyMetadata(
crosapi::mojom::ExtensionControllingProxyPtr extension) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
- void ClearExtensionControllingProxyMetadata() override {
- NOTREACHED_NORETURN();
- }
+ void ClearExtensionControllingProxyMetadata() override { NOTREACHED(); }
void SetQuitClosure(base::OnceClosure quit_closure) {
quit_closure_ = std::move(quit_closure);
diff --git a/chrome/browser/mac/code_sign_clone_manager.mm b/chrome/browser/mac/code_sign_clone_manager.mm
index e4f9fab..57bd970 100644
--- a/chrome/browser/mac/code_sign_clone_manager.mm
+++ b/chrome/browser/mac/code_sign_clone_manager.mm
@@ -493,7 +493,7 @@
} else if (!main_executable_exists && !info_plist_exists) {
return MacCloneExists::kMissingMainExecutableAndInfoPlist;
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/media/capture_access_handler_base.cc b/chrome/browser/media/capture_access_handler_base.cc
index 9835409..6c291b5 100644
--- a/chrome/browser/media/capture_access_handler_base.cc
+++ b/chrome/browser/media/capture_access_handler_base.cc
@@ -300,7 +300,7 @@
return target_web_contents == web_contents->GetOutermostWebContents();
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CaptureAccessHandlerBase::UpdateVideoScreenCaptureStatus(
diff --git a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
index 05f6308..0a5868a 100644
--- a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
@@ -383,7 +383,7 @@
return "persistent-license";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::string IsSupportedByKeySystem(
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_media_sink_util.cc b/chrome/browser/media/router/discovery/access_code/access_code_media_sink_util.cc
index 931e956..449432a1 100644
--- a/chrome/browser/media/router/discovery/access_code/access_code_media_sink_util.cc
+++ b/chrome/browser/media/router/discovery/access_code/access_code_media_sink_util.cc
@@ -256,7 +256,7 @@
case AddSinkResultCode::INTERNAL_MEDIA_ROUTER_ERROR:
return AccessCodeCastAddSinkResult::kInternalMediaRouterError;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::optional<net::IPEndPoint> GetIPEndPointFromValueDict(
diff --git a/chrome/browser/media/router/discovery/dial/parsed_dial_app_info.cc b/chrome/browser/media/router/discovery/dial/parsed_dial_app_info.cc
index e98e5f4f3..9776753e 100644
--- a/chrome/browser/media/router/discovery/dial/parsed_dial_app_info.cc
+++ b/chrome/browser/media/router/discovery/dial/parsed_dial_app_info.cc
@@ -17,7 +17,7 @@
case DialAppState::kStopped:
return "stopped";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ParsedDialAppInfo::ParsedDialAppInfo() = default;
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc
index 901957e..b06bb51 100644
--- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc
+++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc
@@ -75,7 +75,7 @@
case MediaRouterChannelError::PING_TIMEOUT:
return "PING_TIMEOUT";
case MediaRouterChannelError::TOTAL_COUNT:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc
index e3ad0aa46..4d1d738 100644
--- a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc
+++ b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc
@@ -250,7 +250,7 @@
return true;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace media_router
diff --git a/chrome/browser/media/webrtc/capture_policy_utils.cc b/chrome/browser/media/webrtc/capture_policy_utils.cc
index 96aa178..cef3a56f 100644
--- a/chrome/browser/media/webrtc/capture_policy_utils.cc
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -404,7 +404,7 @@
media_types, [capture_level](const DesktopMediaList::Type& type) {
switch (type) {
case DesktopMediaList::Type::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
// SameOrigin is more restrictive than just Tabs, so as long as
// at least SameOrigin is allowed, these entries should stay.
// They should be filtered later by the caller.
diff --git a/chrome/browser/media/webrtc/conditional_focus_browsertest.cc b/chrome/browser/media/webrtc/conditional_focus_browsertest.cc
index e261f592..c51ea0f 100644
--- a/chrome/browser/media/webrtc/conditional_focus_browsertest.cc
+++ b/chrome/browser/media/webrtc/conditional_focus_browsertest.cc
@@ -53,7 +53,7 @@
case FocusEnumValue::kNoFocusChange:
return "no-focus-change";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
enum class Tab { kUnknownTab, kCapturingTab, kCapturedTab };
diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
index 8bbc14c..2df907b 100644
--- a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
+++ b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
@@ -128,7 +128,7 @@
content::DesktopMediaID::Type media_type) {
switch (media_type) {
case content::DesktopMediaID::TYPE_NONE:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case content::DesktopMediaID::TYPE_SCREEN:
return allowed_capture_level >= AllowedScreenCaptureLevel::kDesktop;
case content::DesktopMediaID::TYPE_WINDOW:
diff --git a/chrome/browser/media/webrtc/display_media_access_handler.cc b/chrome/browser/media/webrtc/display_media_access_handler.cc
index 0c2229d8..3c97b4f 100644
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -254,7 +254,7 @@
}
BypassMediaSelectionDialog(web_contents, request, std::move(callback));
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
index 81f9e507..b654d7f 100644
--- a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
+++ b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
@@ -127,7 +127,7 @@
case blink::mojom::MediaStreamType::NO_SERVICE:
case blink::mojom::MediaStreamType::NUM_MEDIA_TYPES:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -441,7 +441,7 @@
case blink::mojom::MediaStreamType::NO_SERVICE:
case blink::mojom::MediaStreamType::NUM_MEDIA_TYPES:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
index 07d7820..c0e51d5 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -191,7 +191,7 @@
case DesktopMediaList::Type::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
content::DesktopMediaID::Id GetUpdatedWindowId(
diff --git a/chrome/browser/media/webrtc/sub_capture_browsertest.cc b/chrome/browser/media/webrtc/sub_capture_browsertest.cc
index 667f954..aef0fde 100644
--- a/chrome/browser/media/webrtc/sub_capture_browsertest.cc
+++ b/chrome/browser/media/webrtc/sub_capture_browsertest.cc
@@ -104,7 +104,7 @@
case Frame::kEmbeddedFrame:
return "embedded";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
const char* ToString(Track track) {
@@ -116,7 +116,7 @@
case Track::kSecond:
return "second";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
const char* ToString(SubCaptureTargetType type) {
@@ -126,7 +126,7 @@
case SubCaptureTargetType::kRestrictionTarget:
return "restriction-target";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Conveniently pack together all relevant information about a tab and
diff --git a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
index 045024d..8e84fbe 100644
--- a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
+++ b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
@@ -93,7 +93,7 @@
case AVAuthorizationStatusAuthorized:
return SystemPermission::kAllowed;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/media/webrtc/thumbnail_capturer.cc b/chrome/browser/media/webrtc/thumbnail_capturer.cc
index 623a4e4..1cfa1460 100644
--- a/chrome/browser/media/webrtc/thumbnail_capturer.cc
+++ b/chrome/browser/media/webrtc/thumbnail_capturer.cc
@@ -7,7 +7,7 @@
#include "base/notreached.h"
void ThumbnailCapturer::SetMaxFrameRate(uint32_t max_frame_rate) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
webrtc::DelegatedSourceListController*
@@ -16,14 +16,14 @@
}
void ThumbnailCapturer::CaptureFrame() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool ThumbnailCapturer::SelectSource(SourceId id) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ThumbnailCapturer::SelectSources(const std::vector<SourceId>& ids,
gfx::Size thumbnail_size) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/chrome/browser/media/webrtc/thumbnail_capturer_mac.mm b/chrome/browser/media/webrtc/thumbnail_capturer_mac.mm
index d56a6d43..a644f17 100644
--- a/chrome/browser/media/webrtc/thumbnail_capturer_mac.mm
+++ b/chrome/browser/media/webrtc/thumbnail_capturer_mac.mm
@@ -464,7 +464,7 @@
case DesktopMediaList::Type::kNone:
case DesktopMediaList::Type::kWebContents:
case DesktopMediaList::Type::kCurrentTab:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -670,7 +670,7 @@
case DesktopMediaList::Type::kNone:
case DesktopMediaList::Type::kWebContents:
case DesktopMediaList::Type::kCurrentTab:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return true;
@@ -1033,5 +1033,5 @@
if (@available(macOS 13.2, *)) {
return std::make_unique<ThumbnailCapturerMac>(type);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc
index 72a05f6..9cad7c2 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc
@@ -452,7 +452,7 @@
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool GzippedLogFileWriter::Finalize() {
@@ -584,7 +584,7 @@
return result;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool GzipLogCompressor::CreateFooter(std::string* output) {
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest_helpers.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest_helpers.cc
index 6292aba84..20a275e2 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest_helpers.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest_helpers.cc
@@ -27,7 +27,7 @@
std::make_unique<GzipLogCompressorFactory>(
std::make_unique<PerfectGzipEstimator::Factory>()));
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#if BUILDFLAG(IS_POSIX)
diff --git a/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc b/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc
index 4a63f15..a37ddf7a 100644
--- a/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc
@@ -154,7 +154,7 @@
case DisplaySurfaceType::kScreen:
return "screen";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void RunGetDisplayMedia(content::WebContents* tab,
@@ -899,7 +899,7 @@
case DisplaySurfaceType::kScreen:
return "MediaStreamTrack";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
protected:
@@ -1743,7 +1743,7 @@
case CapturedTab::kCapturingTab:
return capturing_tab_;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Get the tab that's neither capturing nor being captured.
@@ -1865,7 +1865,7 @@
case Action::kGetZoomLevel:
return false;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
GetDisplayMediaCapturedSurfaceControlTest() = default;
@@ -1884,7 +1884,7 @@
capture_session.GetZoomLevel();
return;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void SetUpInProcessBrowserTestFixture() override {
diff --git a/chrome/browser/media/webrtc/webrtc_text_log_handler.cc b/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
index b7866ce0..58dc4da1 100644
--- a/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
+++ b/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
@@ -420,7 +420,7 @@
case LoggingState::STOPPED:
return "stopped";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
};
std::string error_message_with_state =
diff --git a/chrome/browser/metrics/usage_scenario/chrome_responsiveness_calculator_delegate.cc b/chrome/browser/metrics/usage_scenario/chrome_responsiveness_calculator_delegate.cc
index c0a73e6..271c5d9e 100644
--- a/chrome/browser/metrics/usage_scenario/chrome_responsiveness_calculator_delegate.cc
+++ b/chrome/browser/metrics/usage_scenario/chrome_responsiveness_calculator_delegate.cc
@@ -38,7 +38,7 @@
case Scenario::kAllTabsHiddenNoVideoCaptureOrAudioRecent:
case Scenario::kZeroWindowRecent:
// Short scenario only.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/os_crypt/app_bound_encryption_test_main.cc b/chrome/browser/os_crypt/app_bound_encryption_test_main.cc
index 174f3c8..870def7 100644
--- a/chrome/browser/os_crypt/app_bound_encryption_test_main.cc
+++ b/chrome/browser/os_crypt/app_bound_encryption_test_main.cc
@@ -53,7 +53,7 @@
output_data.erase(0, kTestHeader.length());
}
} else {
- NOTREACHED_NORETURN() << "A valid mode must be specified";
+ NOTREACHED() << "A valid mode must be specified";
}
if (SUCCEEDED(hr)) {
diff --git a/chrome/browser/page_load_metrics/observers/preview_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/preview_page_load_metrics_observer.cc
index f9bfc06..2bfaa7f 100644
--- a/chrome/browser/page_load_metrics/observers/preview_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/preview_page_load_metrics_observer.cc
@@ -133,7 +133,7 @@
switch (page_visit_type) {
case PageVisitType::kObsoleteIndependentVisit:
case PageVisitType::kObsoleteOriginVisit:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case PageVisitType::kPassingVisit:
PAGE_LOAD_LONG_HISTOGRAM(
"PageLoad.Experimental.TotalForegroundDuration.PassingVisit",
@@ -202,11 +202,11 @@
PreviewPageLoadMetricsObserver::Status status) {
switch (status) {
case Status::kNotPreviewed:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case Status::kPreviewed:
return PreviewFinalStatus::kPreviewed;
case Status::kPromoted:
return PreviewFinalStatus::kPromoted;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/chrome/browser/password_manager/android/android_backend_with_double_deletion.cc b/chrome/browser/password_manager/android/android_backend_with_double_deletion.cc
index ae38ff00..5a5d31b 100644
--- a/chrome/browser/password_manager/android/android_backend_with_double_deletion.cc
+++ b/chrome/browser/password_manager/android/android_backend_with_double_deletion.cc
@@ -88,7 +88,7 @@
void AndroidBackendWithDoubleDeletion::GetAllLoginsForAccountAsync(
std::string account,
LoginsOrErrorReply callback) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void AndroidBackendWithDoubleDeletion::FillMatchingLoginsAsync(
diff --git a/chrome/browser/password_manager/android/password_manager_android_util.cc b/chrome/browser/password_manager/android/password_manager_android_util.cc
index 60e794f5..bc0190b 100644
--- a/chrome/browser/password_manager/android/password_manager_android_util.cc
+++ b/chrome/browser/password_manager/android/password_manager_android_util.cc
@@ -356,7 +356,7 @@
case kOn:
return value;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool AreMinUpmRequirementsMet() {
diff --git a/chrome/browser/password_manager/android/password_manager_error_message_delegate.cc b/chrome/browser/password_manager/android/password_manager_error_message_delegate.cc
index b706a1e..8d88e679 100644
--- a/chrome/browser/password_manager/android/password_manager_error_message_delegate.cc
+++ b/chrome/browser/password_manager/android/password_manager_error_message_delegate.cc
@@ -38,7 +38,7 @@
case PasswordStoreBackendErrorType::kUncategorized:
case PasswordStoreBackendErrorType::kKeychainError:
// Other error types aren't supported.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -173,7 +173,7 @@
case PasswordStoreBackendErrorType::kUncategorized:
case PasswordStoreBackendErrorType::kKeychainError:
// Other error types aren't supported.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/password_manager/android/password_store_android_backend.cc b/chrome/browser/password_manager/android/password_store_android_backend.cc
index 14199723..7b968ea0 100644
--- a/chrome/browser/password_manager/android/password_store_android_backend.cc
+++ b/chrome/browser/password_manager/android/password_store_android_backend.cc
@@ -741,7 +741,7 @@
case PasswordStoreOperation::kDisableAutoSignInForOriginsAsync:
case PasswordStoreOperation::kGetGroupedMatchingLoginsAsync:
case PasswordStoreOperation::kGetAllLoginsWithBrandingInfoAsync:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/password_manager/android/password_store_backend_migration_decorator.cc b/chrome/browser/password_manager/android/password_store_backend_migration_decorator.cc
index 5560754c..d12f151 100644
--- a/chrome/browser/password_manager/android/password_store_backend_migration_decorator.cc
+++ b/chrome/browser/password_manager/android/password_store_backend_migration_decorator.cc
@@ -120,7 +120,7 @@
void PasswordStoreBackendMigrationDecorator::GetAllLoginsForAccountAsync(
std::string account,
LoginsOrErrorReply callback) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void PasswordStoreBackendMigrationDecorator::FillMatchingLoginsAsync(
diff --git a/chrome/browser/performance_manager/policies/memory_saver_mode_policy.cc b/chrome/browser/performance_manager/policies/memory_saver_mode_policy.cc
index cd3100b..b94bc86 100644
--- a/chrome/browser/performance_manager/policies/memory_saver_mode_policy.cc
+++ b/chrome/browser/performance_manager/policies/memory_saver_mode_policy.cc
@@ -209,7 +209,7 @@
case MemorySaverModeAggressiveness::kAggressive:
return base::Hours(2);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int MemorySaverModePolicy::GetMaxNumRevisitsForCurrentMode() const {
@@ -221,7 +221,7 @@
case MemorySaverModeAggressiveness::kAggressive:
return 5;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace performance_manager::policies
diff --git a/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc b/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc
index 58aa494..86d141d9 100644
--- a/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc
+++ b/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc
@@ -66,7 +66,7 @@
memory_saver_mode_policy->OnMemorySaverModeChanged(true);
return;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
},
state));
}
diff --git a/chrome/browser/policy/cloud/fm_registration_token_uploader.cc b/chrome/browser/policy/cloud/fm_registration_token_uploader.cc
index 9f2b77e7..5067de5f 100644
--- a/chrome/browser/policy/cloud/fm_registration_token_uploader.cc
+++ b/chrome/browser/policy/cloud/fm_registration_token_uploader.cc
@@ -53,7 +53,7 @@
case PolicyInvalidationScope::kDevice:
return em::FmRegistrationTokenUploadRequest::DEVICE;
case PolicyInvalidationScope::kDeviceLocalAccount:
- NOTREACHED_NORETURN() << "No requests for device local accounts";
+ NOTREACHED() << "No requests for device local accounts";
case PolicyInvalidationScope::kCBCM:
return em::FmRegistrationTokenUploadRequest::BROWSER;
}
diff --git a/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc b/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc
index f5dd0b71..823035e 100644
--- a/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc
+++ b/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc
@@ -219,7 +219,7 @@
}
void PrewarmHttpDiskCacheManager::OnRetry(base::OnceClosure start_retry) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void PrewarmHttpDiskCacheManager::OnHeadersOnly(
diff --git a/chrome/browser/preloading/prerender/prerender_manager_unittest.cc b/chrome/browser/preloading/prerender/prerender_manager_unittest.cc
index 50894cb..3d66236 100644
--- a/chrome/browser/preloading/prerender/prerender_manager_unittest.cc
+++ b/chrome/browser/preloading/prerender/prerender_manager_unittest.cc
@@ -262,7 +262,7 @@
case kSearchSuggestion:
return prerender_utils::kDefaultSearchEngineMetricSuffix;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Navigates to another page that cannot be prerendered.
diff --git a/chrome/browser/preloading/preview/preview_tab.cc b/chrome/browser/preloading/preview/preview_tab.cc
index 4e7229f..fe29cb23 100644
--- a/chrome/browser/preloading/preview/preview_tab.cc
+++ b/chrome/browser/preloading/preview/preview_tab.cc
@@ -255,7 +255,7 @@
preview_zoom_controller_->Zoom(content::PAGE_ZOOM_IN);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return true;
diff --git a/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc b/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc
index 135b6ff08..5377ab8 100644
--- a/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc
+++ b/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc
@@ -114,7 +114,7 @@
return kSizes;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
index aef82204..8fe9a3e 100644
--- a/chrome/browser/printing/print_backend_service_manager.cc
+++ b/chrome/browser/printing/print_backend_service_manager.cc
@@ -693,7 +693,7 @@
return item.first;
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::optional<PrintBackendServiceManager::ClientId>
diff --git a/chrome/browser/printing/print_browsertest.cc b/chrome/browser/printing/print_browsertest.cc
index 4db760d1..e989fa8 100644
--- a/chrome/browser/printing/print_browsertest.cc
+++ b/chrome/browser/printing/print_browsertest.cc
@@ -2176,7 +2176,7 @@
const testing::TestParamInfo<DocumentDataType>& info) {
switch (info.param) {
case DocumentDataType::kUnknown:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case DocumentDataType::kPdf:
return "Pdf";
case DocumentDataType::kXps:
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
index 0e48a758..402be34 100644
--- a/chrome/browser/printing/printer_query.cc
+++ b/chrome/browser/printing/printer_query.cc
@@ -306,7 +306,7 @@
#if BUILDFLAG(ENABLE_OOP_PRINTING)
void PrinterQuery::SetClientId(PrintBackendServiceManager::ClientId client_id) {
// Only supposed to be called for `PrinterQueryOop` objects.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
diff --git a/chrome/browser/printing/web_api/web_printing_mojom_traits.cc b/chrome/browser/printing/web_api/web_printing_mojom_traits.cc
index 5f43015..cf328b5 100644
--- a/chrome/browser/printing/web_api/web_printing_mojom_traits.cc
+++ b/chrome/browser/printing/web_api/web_printing_mojom_traits.cc
@@ -93,7 +93,7 @@
case DuplexMode::kShortEdge:
return WebPrintingSides::kTwoSidedShortEdge;
case DuplexMode::kUnknownDuplexMode:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/printing/web_api/web_printing_mojom_traits.h b/chrome/browser/printing/web_api/web_printing_mojom_traits.h
index fe86e5b..edac760f 100644
--- a/chrome/browser/printing/web_api/web_printing_mojom_traits.h
+++ b/chrome/browser/printing/web_api/web_printing_mojom_traits.h
@@ -33,7 +33,7 @@
static blink::mojom::WebPrinterState ToMojom(ipp_pstate_t input);
static bool FromMojom(blink::mojom::WebPrinterState input,
ipp_pstate_t* output) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
};
@@ -45,7 +45,7 @@
static bool FromMojom(
blink::mojom::WebPrinterStateReason input,
printing::PrinterStatus::PrinterReason::Reason* output) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
};
@@ -63,39 +63,39 @@
// typemap.
static const std::string& job_name(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static uint32_t copies(const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const blink::mojom::WebPrintingMediaCollectionRequestedPtr& media_col(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const std::optional<std::string>& media_source(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const std::optional<blink::mojom::WebPrintingMultipleDocumentHandling>&
multiple_document_handling(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const std::optional<blink::mojom::WebPrintingOrientationRequested>&
orientation_requested(const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const std::optional<gfx::Size>& printer_resolution(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const std::optional<blink::mojom::WebPrintColorMode>& print_color_mode(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static const std::optional<blink::mojom::WebPrintingSides>& sides(
const std::unique_ptr<printing::PrintSettings>& ptr) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
static bool Read(blink::mojom::WebPrintJobTemplateAttributesDataView data,
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc
index eb8e507..1dc4fed2 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc
@@ -274,7 +274,7 @@
case AttestedApiStatus::kNone:
return "None";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -309,7 +309,7 @@
case AttestedApiStatus::kNone:
return {};
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/profiles/delete_profile_helper.cc b/chrome/browser/profiles/delete_profile_helper.cc
index 6f99da0..b7a1bf0 100644
--- a/chrome/browser/profiles/delete_profile_helper.cc
+++ b/chrome/browser/profiles/delete_profile_helper.cc
@@ -90,7 +90,7 @@
// This is believed to be unreachable (outside tests) but the stakes are quite
// high too, so fall back to the legacy logic just in case.
// TODO(crbug.com/40797392): Remove this code and replace it all with
- // CHECK_IS_TEST() or NOTREACHED_NORETURN().
+ // CHECK_IS_TEST() or NOTREACHED().
if (SyncServiceFactory::HasSyncService(profile)) {
syncer::SyncService* sync_service =
SyncServiceFactory::GetForProfile(profile);
diff --git a/chrome/browser/promos/promos_utils.cc b/chrome/browser/promos/promos_utils.cc
index 2f44610..a224f49 100644
--- a/chrome/browser/promos/promos_utils.cc
+++ b/chrome/browser/promos/promos_utils.cc
@@ -57,7 +57,7 @@
return "AddressPromo";
// TODO(crbug.com/340269648): Add IOS Payment Promo for Desktop.
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -122,7 +122,7 @@
"IOS.DesktopPasswordPromo.Shown",
promos_utils::DesktopIOSPasswordPromoImpression::kSecondImpression);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -143,7 +143,7 @@
promo_impression = DesktopIOSPromoImpression::kThirdImpression;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
base::UmaHistogramEnumeration(
"IOS.Desktop." + promo_histogram_type + ".Shown", promo_impression);
@@ -181,7 +181,7 @@
break;
// TODO(crbug.com/340269648): Add IOS Payment Promo for Desktop.
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -219,7 +219,7 @@
base::UmaHistogramEnumeration(
"IOS.DesktopPasswordPromo.SecondImpression.Action", action);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -243,7 +243,7 @@
"IOS.Desktop." + promo_histogram_type + ".ThirdImpression.Action",
action);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc
index 03d0710..f32fc5d 100644
--- a/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc
@@ -112,7 +112,7 @@
const std::string& data,
const net::NetworkTrafficAnnotationTag& traffic_annotation,
ConnectorUploadRequest::Callback callback) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<ConnectorUploadRequest> FakeUploaderFactory::CreateFileRequest(
@@ -140,7 +140,7 @@
base::ReadOnlySharedMemoryRegion page_region,
const net::NetworkTrafficAnnotationTag& traffic_annotation,
ConnectorUploadRequest::Callback callback) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/safety_hub/android/magic_stack_bridge.cc b/chrome/browser/safety_hub/android/magic_stack_bridge.cc
index 0031c721..16e82e4 100644
--- a/chrome/browser/safety_hub/android/magic_stack_bridge.cc
+++ b/chrome/browser/safety_hub/android/magic_stack_bridge.cc
@@ -37,7 +37,7 @@
case safety_hub::SafetyHubModuleType::PASSWORDS:
return kPasswords;
default:
- NOTREACHED_NORETURN() << "Module not supported on Android.";
+ NOTREACHED() << "Module not supported on Android.";
}
}
diff --git a/chrome/browser/screen_ai/optical_character_recognizer_browsertest.cc b/chrome/browser/screen_ai/optical_character_recognizer_browsertest.cc
index a5941587..cc1d25e 100644
--- a/chrome/browser/screen_ai/optical_character_recognizer_browsertest.cc
+++ b/chrome/browser/screen_ai/optical_character_recognizer_browsertest.cc
@@ -199,8 +199,7 @@
ScreenAIInstallState::GetInstance()->SetComponentFolder(
GetComponentBinaryPathForTests().DirName());
#else
- NOTREACHED_NORETURN()
- << "Test library is used on a not-suppported platform.";
+ NOTREACHED() << "Test library is used on a not-suppported platform.";
#endif
} else {
// Set an observer to reply download failed, when download requested.
diff --git a/chrome/browser/screen_ai/screen_ai_dlc_installer.cc b/chrome/browser/screen_ai/screen_ai_dlc_installer.cc
index 9693b38..24a82ce 100644
--- a/chrome/browser/screen_ai/screen_ai_dlc_installer.cc
+++ b/chrome/browser/screen_ai/screen_ai_dlc_installer.cc
@@ -65,7 +65,7 @@
} else if (result_string == dlcservice::kErrorNoImageFound) {
result_enum = DlcInstallResult::kErrorNoImageFound;
} else {
- NOTREACHED_NORETURN() << "Unexpected error: " << result_string;
+ NOTREACHED() << "Unexpected error: " << result_string;
}
base::UmaHistogramEnumeration("Accessibility.ScreenAI.DlcInstallResult",
diff --git a/chrome/browser/screen_ai/screen_ai_service_router_browsertest.cc b/chrome/browser/screen_ai/screen_ai_service_router_browsertest.cc
index bbec8e3..0bd24e4 100644
--- a/chrome/browser/screen_ai/screen_ai_service_router_browsertest.cc
+++ b/chrome/browser/screen_ai/screen_ai_service_router_browsertest.cc
@@ -76,7 +76,7 @@
#if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS)
return screen_ai::GetComponentBinaryPathForTests();
#else
- NOTREACHED_NORETURN() << "Test library is used on a not-suppported platform.";
+ NOTREACHED() << "Test library is used on a not-suppported platform.";
#endif
}
diff --git a/chrome/browser/sharesheet/sharesheet_service.cc b/chrome/browser/sharesheet/sharesheet_service.cc
index 90e348e2..41627ce 100644
--- a/chrome/browser/sharesheet/sharesheet_service.cc
+++ b/chrome/browser/sharesheet/sharesheet_service.cc
@@ -464,7 +464,7 @@
SharesheetMetrics::UserAction::kCopyAction);
return;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -496,7 +496,7 @@
case apps::AppType::kExtension:
case apps::AppType::kStandaloneBrowserExtension:
case apps::AppType::kUnknown:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index dcab91a8..b12e7409 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -759,7 +759,7 @@
g_key_file_free(key_file);
return output_buffer;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
return std::string();
#endif
}
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc
index c320ad0..3bce0154 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc
@@ -262,7 +262,7 @@
return observer.get();
}
}
- NOTREACHED_NORETURN() << "No observer found for " << cookie_name;
+ NOTREACHED() << "No observer found for " << cookie_name;
}
base::Time cookie_expiration_time(const std::string& cookie_name) {
diff --git a/chrome/browser/signin/dice_web_signin_interceptor.cc b/chrome/browser/signin/dice_web_signin_interceptor.cc
index 3c3ee81..fc03014 100644
--- a/chrome/browser/signin/dice_web_signin_interceptor.cc
+++ b/chrome/browser/signin/dice_web_signin_interceptor.cc
@@ -414,7 +414,7 @@
return SinginInterceptSupervisionState::kUnknownSupervision;
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void MaybeRecordSupervisedUserStateMetrics(
@@ -1238,7 +1238,7 @@
processed_result);
break;
case SigninInterceptionResult::kAcceptedWithExistingProfile:
- NOTREACHED_NORETURN()
+ NOTREACHED()
<< "Those results are not expected within the Chrome Signin Bubble.";
case SigninInterceptionResult::kAccepted:
RecordChromeSigninNumberOfDismissesForAccount(account_info.gaia,
diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
index 68feb08..96e6d2c 100644
--- a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
+++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
@@ -83,7 +83,7 @@
case RequestOutcome::kAllowedBySameSite:
case RequestOutcome::kDeniedAborted:
case RequestOutcome::kAllowedByFedCM:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -107,7 +107,7 @@
case RequestOutcome::kAllowedBySameSite:
case RequestOutcome::kDeniedAborted:
case RequestOutcome::kAllowedByFedCM:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -126,7 +126,7 @@
return persist ? RequestOutcome::kDeniedByUser
: RequestOutcome::kReusedPreviousDecision;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -168,7 +168,7 @@
case RequestOutcome::kAllowedBySameSite:
case RequestOutcome::kDeniedAborted:
case RequestOutcome::kAllowedByFedCM:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -663,5 +663,5 @@
// We need to notify the network service of content setting updates before we
// run our callback. As a result we do our updates when we're notified of a
// permission being set and should not be called here.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/chrome/browser/supervised_user/chromeos/chromeos_utils.cc b/chrome/browser/supervised_user/chromeos/chromeos_utils.cc
index 922defc..592ac01 100644
--- a/chrome/browser/supervised_user/chromeos/chromeos_utils.cc
+++ b/chrome/browser/supervised_user/chromeos/chromeos_utils.cc
@@ -27,7 +27,7 @@
->GetRemote<crosapi::mojom::ParentAccess>()
.get();
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.cc b/chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.cc
index 8383cb8..81919e1 100644
--- a/chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.cc
+++ b/chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.cc
@@ -39,7 +39,7 @@
return supervised_user::WebContentHandler::LocalApprovalResult::kError;
case crosapi::mojom::ParentAccessResult::Tag::kDisabled:
// Disabled is not a possible result for Local Web Approvals.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/supervised_user/classify_url_navigation_throttle.cc b/chrome/browser/supervised_user/classify_url_navigation_throttle.cc
index 544a971..981ea8f 100644
--- a/chrome/browser/supervised_user/classify_url_navigation_throttle.cc
+++ b/chrome/browser/supervised_user/classify_url_navigation_throttle.cc
@@ -124,7 +124,7 @@
return;
}
}
- NOTREACHED_NORETURN() << "Mismatched verdict for url: " << url;
+ NOTREACHED() << "Mismatched verdict for url: " << url;
}
void ClassifyUrlNavigationThrottle::CheckURL() {
diff --git a/chrome/browser/supervised_user/desktop/supervised_user_extension_browsertest.cc b/chrome/browser/supervised_user/desktop/supervised_user_extension_browsertest.cc
index 7a6eee6..f2f88fa 100644
--- a/chrome/browser/supervised_user/desktop/supervised_user_extension_browsertest.cc
+++ b/chrome/browser/supervised_user/desktop/supervised_user_extension_browsertest.cc
@@ -105,7 +105,7 @@
#else
// For ChromeOS, the parental controls should always apply to extensions
// and this case should not be reached. See the instantiation of the test suite.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
}
scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
diff --git a/chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.cc b/chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.cc
index 6e196a4..29a1fcf 100644
--- a/chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.cc
+++ b/chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.cc
@@ -24,5 +24,5 @@
const supervised_user::UrlFormatter& url_formatter,
ApprovalRequestInitiatedCallback callback) {
// Method unsupposted on Desktop.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/chrome/browser/supervised_user/supervised_user_extensions_metrics_recorder.cc b/chrome/browser/supervised_user/supervised_user_extensions_metrics_recorder.cc
index 46cbda9..b72ec7e7 100644
--- a/chrome/browser/supervised_user/supervised_user_extensions_metrics_recorder.cc
+++ b/chrome/browser/supervised_user/supervised_user_extensions_metrics_recorder.cc
@@ -135,7 +135,7 @@
base::UserMetricsAction(kExtensionInstallDialogOpenedActionName));
break;
case ExtensionInstallDialogState::kAskedParentDeprecated:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case ExtensionInstallDialogState::kChildCanceled:
base::RecordAction(base::UserMetricsAction(
kExtensionInstallDialogChildCanceledActionName));
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc
index a335e74..435c43b0 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc
@@ -100,7 +100,7 @@
case FeatureStatus::kEnabled:
return "ClassifyUrlNavigationThrottle";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
static void InitFeatureList(base::test::ScopedFeatureList& feature_list,
diff --git a/chrome/browser/supervised_user/supervised_user_verification_page.cc b/chrome/browser/supervised_user/supervised_user_verification_page.cc
index 9f590ba5..3fbdb3a 100644
--- a/chrome/browser/supervised_user/supervised_user_verification_page.cc
+++ b/chrome/browser/supervised_user/supervised_user_verification_page.cc
@@ -143,6 +143,6 @@
// Commands are for testing.
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 29ed1f6..e731ca2 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -242,7 +242,7 @@
->GetSavedTabGroupControllerDelegate()
.get();
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
}
@@ -260,7 +260,7 @@
->GetSharedTabGroupControllerDelegate()
.get();
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
}
diff --git a/chrome/browser/sync/test/integration/ash_trusted_vault_keys_sharing_sync_test.cc b/chrome/browser/sync/test/integration/ash_trusted_vault_keys_sharing_sync_test.cc
index 9ba2d95f..89955c5 100644
--- a/chrome/browser/sync/test/integration/ash_trusted_vault_keys_sharing_sync_test.cc
+++ b/chrome/browser/sync/test/integration/ash_trusted_vault_keys_sharing_sync_test.cc
@@ -156,7 +156,7 @@
"crosapi observer.";
return recoverability_state_changed_notified_;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc
index ceebf05..a105130 100644
--- a/chrome/browser/sync/test/integration/passwords_helper.cc
+++ b/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -153,7 +153,7 @@
PasswordForm::Store store) {
switch (store) {
case PasswordForm::Store::kNotSet:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case PasswordForm::Store::kProfileStore:
return GetProfilePasswordStoreInterface(index);
case PasswordForm::Store::kAccountStore:
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index cd916fbd..0ee62a4 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -135,8 +135,8 @@
case ash::ShellDelegate::FeedbackSource::kWindowLayoutMenu:
return feedback::FeedbackSource::kFeedbackSourceWindowLayoutMenu;
}
- NOTREACHED_NORETURN() << "Unable to retrieve feedback::FeedbackSource due to "
- "unknown source type.";
+ NOTREACHED() << "Unable to retrieve feedback::FeedbackSource due to "
+ "unknown source type.";
}
} // namespace
diff --git a/chrome/browser/ui/ash/download_status/notification_display_client_browsertest.cc b/chrome/browser/ui/ash/download_status/notification_display_client_browsertest.cc
index 2c7bebc..b903f7b6 100644
--- a/chrome/browser/ui/ash/download_status/notification_display_client_browsertest.cc
+++ b/chrome/browser/ui/ash/download_status/notification_display_client_browsertest.cc
@@ -135,7 +135,7 @@
case CommandType::kEditWithMediaApp:
return IDS_DOWNLOAD_NOTIFICATION_LABEL_OPEN_AND_EDIT;
case CommandType::kOpenFile:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case CommandType::kOpenWithMediaApp:
return IDS_DOWNLOAD_NOTIFICATION_LABEL_OPEN;
case CommandType::kPause:
@@ -143,7 +143,7 @@
case CommandType::kResume:
return IDS_ASH_DOWNLOAD_COMMAND_TEXT_RESUME;
case CommandType::kShowInBrowser:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case CommandType::kShowInFolder:
return IDS_ASH_DOWNLOAD_COMMAND_TEXT_SHOW_IN_FOLDER;
case CommandType::kViewDetailsInBrowser:
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_util.cc b/chrome/browser/ui/ash/holding_space/holding_space_util.cc
index b7a91c1..9193969 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_util.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_util.cc
@@ -75,7 +75,7 @@
return HoldingSpaceFile::FileSystemType::kUnknown;
case storage::FileSystemType::kFileSystemInternalTypeEnumStart:
case storage::FileSystemType::kFileSystemInternalTypeEnumEnd:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/autofill/autofill_context_menu_manager.cc b/chrome/browser/ui/autofill/autofill_context_menu_manager.cc
index 71589e0b..140237f 100644
--- a/chrome/browser/ui/autofill/autofill_context_menu_manager.cc
+++ b/chrome/browser/ui/autofill/autofill_context_menu_manager.cc
@@ -145,7 +145,7 @@
case blink::mojom::FormControlType::kSelectList:
return false;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Returns true if the given id is one generated for autofill context menu.
diff --git a/chrome/browser/ui/autofill/autofill_context_menu_manager_browsertest.cc b/chrome/browser/ui/autofill/autofill_context_menu_manager_browsertest.cc
index 5bf5688..cfe0e53 100644
--- a/chrome/browser/ui/autofill/autofill_context_menu_manager_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_context_menu_manager_browsertest.cc
@@ -1469,7 +1469,7 @@
case AutofillSuggestionTriggerSource::kManualFallbackPasswords:
return "ClassifiedAsTargetFilling";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}();
@@ -1501,7 +1501,7 @@
case AutofillSuggestionTriggerSource::kManualFallbackPasswords:
return IDC_CONTENT_CONTEXT_AUTOFILL_FALLBACK_PASSWORDS_SELECT_PASSWORD;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1524,7 +1524,7 @@
return form;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1540,7 +1540,7 @@
case AutofillSuggestionTriggerSource::kManualFallbackPasswords:
return ".Password";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
index bca1902..753098f 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -526,7 +526,7 @@
AutofillMetrics::LogDeleteAddressProfileFromKeyboardAccessory();
break;
case AutofillMetrics::SingleEntryRemovalMethod::kDeleteButtonClicked:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
break;
case FillingProduct::kAutocomplete:
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
index 60bddd4b..8f9ca57 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -519,7 +519,7 @@
/*on_user_decision_callback=*/std::move(on_user_decision_callback));
#else
// Edit address profile dialog is only available is desktop.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -537,7 +537,7 @@
/*delete_dialog_callback=*/std::move(delete_dialog_callback));
#else
// Delete address profile dialog is only available is desktop.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/ui/autofill/payments/autofill_snackbar_controller_impl.cc b/chrome/browser/ui/autofill/payments/autofill_snackbar_controller_impl.cc
index 72b84df..3ed09ceb 100644
--- a/chrome/browser/ui/autofill/payments/autofill_snackbar_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/autofill_snackbar_controller_impl.cc
@@ -80,7 +80,7 @@
// SnackbarManager.java will dismiss the snackbar after the click.
break;
case AutofillSnackbarType::kUnspecified:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -113,7 +113,7 @@
return l10n_util::GetStringUTF16(
IDS_AUTOFILL_SAVE_SERVER_IBAN_SUCCESS_SNACKBAR_MESSAGE_TEXT);
case AutofillSnackbarType::kUnspecified:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -133,7 +133,7 @@
return l10n_util::GetStringUTF16(
IDS_AUTOFILL_SAVE_SERVER_IBAN_SUCCESS_SNACKBAR_BUTTON_TEXT);
case AutofillSnackbarType::kUnspecified:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client.cc b/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client.cc
index 5588504..54b5028 100644
--- a/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client.cc
+++ b/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client.cc
@@ -806,7 +806,7 @@
delegate, std::move(cards_to_suggest), std::move(suggestions));
#else
// Touch To Fill is not supported on Desktop.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -819,7 +819,7 @@
delegate, std::move(ibans_to_suggest));
#else
// Touch To Fill is not supported on Desktop.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/ui/autofill/payments/virtual_card_enroll_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/virtual_card_enroll_bubble_controller_impl.cc
index 571688b..3961b87 100644
--- a/chrome/browser/ui/autofill/payments/virtual_card_enroll_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/payments/virtual_card_enroll_bubble_controller_impl.cc
@@ -258,7 +258,7 @@
case EnrollmentStatus::kNone:
return false;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}();
diff --git a/chrome/browser/ui/browser_navigator_iwa_browsertest.cc b/chrome/browser/ui/browser_navigator_iwa_browsertest.cc
index 5cd493bc..431dfda6 100644
--- a/chrome/browser/ui/browser_navigator_iwa_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_iwa_browsertest.cc
@@ -393,7 +393,7 @@
case WindowOpenDisposition::NEW_BACKGROUND_TAB:
return "NEW_BACKGROUND_TAB";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
});
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 78c2edc..8b76c3b1 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -122,7 +122,7 @@
break;
default:
// Currently only defined and implemented for StorageAccess.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1091,7 +1091,7 @@
else if (CameraAccessed())
title_id = IDS_CAMERA_ACCESSED_TITLE;
else
- NOTREACHED_NORETURN();
+ NOTREACHED();
set_title(l10n_util::GetStringUTF16(title_id));
}
@@ -1111,7 +1111,7 @@
else if (CameraAccessed())
message_id = IDS_CAMERA_ACCESSED;
else
- NOTREACHED_NORETURN();
+ NOTREACHED();
set_message(l10n_util::GetStringUTF16(message_id));
}
@@ -1357,7 +1357,7 @@
set_title(l10n_util::GetStringUTF16(IDS_GEOLOCATION_TURNED_OFF_IN_OS));
#else
// The system-level location permission is not supported on Linux.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
clear_message();
diff --git a/chrome/browser/ui/download/download_bubble_info_utils.cc b/chrome/browser/ui/download/download_bubble_info_utils.cc
index 8d1c8d8a..c1308ea 100644
--- a/chrome/browser/ui/download/download_bubble_info_utils.cc
+++ b/chrome/browser/ui/download/download_bubble_info_utils.cc
@@ -209,7 +209,7 @@
case download::DownloadItem::CANCELLED:
break;
case download::DownloadItem::MAX_DOWNLOAD_STATE:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return IconAndColorForDownloadOff();
diff --git a/chrome/browser/ui/extensions/controlled_home_bubble_delegate.cc b/chrome/browser/ui/extensions/controlled_home_bubble_delegate.cc
index 46149ab..41069ed 100644
--- a/chrome/browser/ui/extensions/controlled_home_bubble_delegate.cc
+++ b/chrome/browser/ui/extensions/controlled_home_bubble_delegate.cc
@@ -253,7 +253,7 @@
AcknowledgeExtension(*profile_, extension_->id());
break;
case CLOSE_DISMISS_DEACTIVATION:
- NOTREACHED_NORETURN(); // This was handled above.
+ NOTREACHED(); // This was handled above.
}
// Warning: |this| may be deleted here!
diff --git a/chrome/browser/ui/file_system_access/file_system_access_permission_dialog.cc b/chrome/browser/ui/file_system_access/file_system_access_permission_dialog.cc
index 95df831d..1ca5d88 100644
--- a/chrome/browser/ui/file_system_access/file_system_access_permission_dialog.cc
+++ b/chrome/browser/ui/file_system_access/file_system_access_permission_dialog.cc
@@ -61,7 +61,7 @@
: IDS_FILE_SYSTEM_ACCESS_ORIGIN_SCOPED_WRITE_PERMISSION_FILE_TEXT;
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int GetButtonLabel(const FileRequestData& file_request_data) {
@@ -77,7 +77,7 @@
? IDS_FILE_SYSTEM_ACCESS_EDIT_DIRECTORY_PERMISSION_ALLOW_TEXT
: IDS_FILE_SYSTEM_ACCESS_EDIT_FILE_PERMISSION_ALLOW_TEXT;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string GetWindowTitle(const FileRequestData& file_request_data) {
@@ -108,7 +108,7 @@
file_request_data.path));
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<ui::DialogModel> CreateFileSystemAccessPermissionDialog(
diff --git a/chrome/browser/ui/layout_constants.cc b/chrome/browser/ui/layout_constants.cc
index ea5c2c05..87c4ee64 100644
--- a/chrome/browser/ui/layout_constants.cc
+++ b/chrome/browser/ui/layout_constants.cc
@@ -66,7 +66,7 @@
// constants, so instead of spreading the permutation logic here and
// elsewhere, it's consolidated in `Layout()` and will be moved back
// here once we decide on a permutation.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case LOCATION_BAR_TRAILING_DECORATION_EDGE_PADDING:
return touch_ui ? 3 : 12;
case LOCATION_BAR_TRAILING_DECORATION_INNER_PADDING:
diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc
index 595b841..c59b64e 100644
--- a/chrome/browser/ui/managed_ui.cc
+++ b/chrome/browser/ui/managed_ui.cc
@@ -412,7 +412,7 @@
base::UTF8ToUTF16(*GetAccountManagerIdentity(profile)));
case SUPERVISED:
case NOT_MANAGED:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
#endif
diff --git a/chrome/browser/ui/passwords/bubble_controllers/manage_passwords_bubble_controller.cc b/chrome/browser/ui/passwords/bubble_controllers/manage_passwords_bubble_controller.cc
index 849b503..f4d1e70 100644
--- a/chrome/browser/ui/passwords/bubble_controllers/manage_passwords_bubble_controller.cc
+++ b/chrome/browser/ui/passwords/bubble_controllers/manage_passwords_bubble_controller.cc
@@ -111,7 +111,7 @@
}
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -166,7 +166,7 @@
? SyncState::kActiveWithSyncFeatureEnabled
: SyncState::kActiveWithAccountPasswords;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string ManagePasswordsBubbleController::GetPrimaryAccountEmail() {
diff --git a/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller.cc b/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller.cc
index 3eed52e..1b92cca 100644
--- a/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller.cc
+++ b/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller.cc
@@ -44,7 +44,7 @@
case password_manager::ui::PENDING_PASSWORD_UPDATE_STATE:
return metrics_util::MANUAL_WITH_PASSWORD_PENDING_UPDATE;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} else {
switch (state) {
@@ -53,7 +53,7 @@
case password_manager::ui::PENDING_PASSWORD_UPDATE_STATE:
return metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING_UPDATE;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/chrome/browser/ui/serial/serial_chooser_controller.cc b/chrome/browser/ui/serial/serial_chooser_controller.cc
index ac5ef738..701239d 100644
--- a/chrome/browser/ui/serial/serial_chooser_controller.cc
+++ b/chrome/browser/ui/serial/serial_chooser_controller.cc
@@ -293,7 +293,7 @@
base::mac::OpenSystemSettingsPane(
base::mac::SystemSettingsPane::kPrivacySecurity_Bluetooth);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc b/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc
index 63830bb..91fb228 100644
--- a/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc
+++ b/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc
@@ -170,6 +170,6 @@
chrome::ShowBrowserModal(&browser, dialog_builder.Build());
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.cc b/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.cc
index 891ee72..730557b 100644
--- a/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.cc
+++ b/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.cc
@@ -77,7 +77,7 @@
case TabSharingInfoBarDelegate::TabShareType::CAPTURE:
return l10n_util::GetStringUTF16(IDS_TAB_SHARING_INFOBAR_STOP_BUTTON);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
@@ -286,7 +286,7 @@
case TabRole::kSelfCapturingTab:
return true;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
@@ -386,7 +386,7 @@
return GetMessageTextCapturing(IsCapturedTab(role_), shared_tab_name_,
capturer_name_);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string TabSharingInfoBarDelegate::GetButtonLabel(
@@ -455,7 +455,7 @@
case TabSharingInfoBarButton::kCapturedSurfaceControlIndicator:
return *csc_indicator_button_;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
TabSharingInfoBarDelegateButton& TabSharingInfoBarDelegate::GetButton(
diff --git a/chrome/browser/ui/tabs/tab_collection_storage.cc b/chrome/browser/ui/tabs/tab_collection_storage.cc
index 0f474273..2872d4b 100644
--- a/chrome/browser/ui/tabs/tab_collection_storage.cc
+++ b/chrome/browser/ui/tabs/tab_collection_storage.cc
@@ -66,7 +66,7 @@
}
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void TabCollectionStorage::CloseTab(TabModel* tab) {
@@ -110,7 +110,7 @@
}
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void TabCollectionStorage::CloseCollection(TabCollection* collection) {
diff --git a/chrome/browser/ui/tabs/tab_style.cc b/chrome/browser/ui/tabs/tab_style.cc
index 84fcc3f..d482239 100644
--- a/chrome/browser/ui/tabs/tab_style.cc
+++ b/chrome/browser/ui/tabs/tab_style.cc
@@ -177,7 +177,7 @@
return color_provider.GetColor(kInactiveColorIds[hovered][frame_active]);
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/tabs/unpinned_tab_collection.cc b/chrome/browser/ui/tabs/unpinned_tab_collection.cc
index 4890b89..009723f 100644
--- a/chrome/browser/ui/tabs/unpinned_tab_collection.cc
+++ b/chrome/browser/ui/tabs/unpinned_tab_collection.cc
@@ -107,7 +107,7 @@
}
direct_child_index++;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void UnpinnedTabCollection::AppendTab(std::unique_ptr<TabModel> tab_model) {
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index eee22022..72508cc 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -356,7 +356,7 @@
// On macOS, the cut/copy/paste accelerators are defined in the main menu
// built in main_menu_builder.mm and the accelerator is user configurable. All
// of this is handled by CommandDispatcher.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#else
// The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
// anywhere else.
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
index 4662e1b..f072f30 100644
--- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
@@ -267,7 +267,7 @@
case apps::AppType::kRemote:
case apps::AppType::kExtension:
case apps::AppType::kStandaloneBrowserExtension:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case apps::AppType::kStandaloneBrowserChromeApp:
// Do nothing special for kStandaloneBrowserChromeApp.
break;
@@ -276,7 +276,7 @@
InitializeViewForArcApp(profile, app_id);
break;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
case apps::AppType::kPluginVm:
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -284,7 +284,7 @@
l10n_util::GetStringUTF16(IDS_PLUGIN_VM_UNINSTALL_PROMPT_BODY));
break;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
case apps::AppType::kBorealis:
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -297,7 +297,7 @@
}
break;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
case apps::AppType::kCrostini:
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -305,14 +305,14 @@
IDS_CROSTINI_APPLICATION_UNINSTALL_CONFIRM_BODY));
break;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
case apps::AppType::kBruschetta:
#if BUILDFLAG(IS_CHROMEOS_ASH)
// TODO(b/247636749): Implement Bruschetta uninstall.
break;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
case apps::AppType::kWeb:
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
index ec1cda2..93830494 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -341,7 +341,7 @@
DevToolsOpenedByAction::kInspectorModeShortcut);
return true;
default:
- NOTREACHED_NORETURN() << "Unknown accelerator sent to app window.";
+ NOTREACHED() << "Unknown accelerator sent to app window.";
}
}
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index 6de0c2b..c8a9579 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -474,12 +474,12 @@
ExclusiveAccessBubbleType bubble_type,
const int64_t display_id) {
// This codepath is never hit for Chrome Apps.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ChromeNativeAppWindowViewsAuraAsh::ExitFullscreen() {
// This codepath is never hit for Chrome Apps.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ChromeNativeAppWindowViewsAuraAsh::UpdateExclusiveAccessBubble(
diff --git a/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.cc b/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.cc
index c59fcfb..440e947 100644
--- a/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.cc
+++ b/chrome/browser/ui/views/autofill/autofill_bubble_handler_impl.cc
@@ -174,7 +174,7 @@
}
case IbanBubbleType::kUploadCompleted:
case IbanBubbleType::kInactive:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -364,7 +364,7 @@
return bubble;
}
case MandatoryReauthBubbleType::kInactive:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc b/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc
index 1a903a2..595b06d3 100644
--- a/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc
+++ b/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc
@@ -40,7 +40,7 @@
} else if (GetParam() == "ServerCardUnmask") {
return AutofillProgressDialogType::kServerCardUnmaskProgressDialog;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::string GetDialogTypeStringForLogging() const {
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_view.cc b/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_view.cc
index 7c461d3..d2f7376 100644
--- a/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_view.cc
+++ b/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_view.cc
@@ -42,7 +42,7 @@
case CardUnmaskChallengeOptionType::kUnknownType:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ui/views/autofill/payments/iban_bubble_view_uitest.cc b/chrome/browser/ui/views/autofill/payments/iban_bubble_view_uitest.cc
index ff57e7c..a5f90f84 100644
--- a/chrome/browser/ui/views/autofill/payments/iban_bubble_view_uitest.cc
+++ b/chrome/browser/ui/views/autofill/payments/iban_bubble_view_uitest.cc
@@ -435,7 +435,7 @@
}
case IbanBubbleType::kUploadCompleted:
case IbanBubbleType::kInactive:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return iban_bubble_view;
}
diff --git a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views.cc
index e9de4db..d2b9f68 100644
--- a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views.cc
+++ b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views.cc
@@ -78,7 +78,7 @@
return;
case AutofillOfferData::OfferType::FREE_LISTING_COUPON_OFFER:
case AutofillOfferData::OfferType::UNKNOWN:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_interactive_uitest.cc b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_interactive_uitest.cc
index 3d1949fc3c..ae764d8 100644
--- a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_interactive_uitest.cc
+++ b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_interactive_uitest.cc
@@ -93,7 +93,7 @@
ShowBubbleForGPayPromoCodeOfferAndVerify();
break;
case AutofillOfferData::OfferType::UNKNOWN:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -153,7 +153,7 @@
case AutofillOfferData::OfferType::FREE_LISTING_COUPON_OFFER:
return "FreeListingCouponOffer";
case AutofillOfferData::OfferType::UNKNOWN:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc
index b85473d..de65dca 100644
--- a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc
+++ b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc
@@ -152,7 +152,7 @@
SetUpGPayPromoCodeOfferDataWithDomains(domains);
break;
case AutofillOfferData::OfferType::UNKNOWN:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/autofill/payments/payments_window_user_consent_dialog_view.cc b/chrome/browser/ui/views/autofill/payments/payments_window_user_consent_dialog_view.cc
index f0b7f854..3e1805a 100644
--- a/chrome/browser/ui/views/autofill/payments/payments_window_user_consent_dialog_view.cc
+++ b/chrome/browser/ui/views/autofill/payments/payments_window_user_consent_dialog_view.cc
@@ -56,7 +56,7 @@
// There is no close button present for the consent dialog, so this should
// never be reached. It is also a tab-modal dialog, so it should never
// lose focus.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case views::Widget::ClosedReason::kUnspecified:
return PaymentsWindowUserConsentDialogResult::kTabOrBrowserClosed;
case views::Widget::ClosedReason::kEscKeyPressed:
diff --git a/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views_interactive_uitest.cc b/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views_interactive_uitest.cc
index a054a1d..19eb685 100644
--- a/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views_interactive_uitest.cc
+++ b/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views_interactive_uitest.cc
@@ -219,7 +219,7 @@
break;
case VirtualCardEnrollmentBubbleResult::
VIRTUAL_CARD_ENROLLMENT_BUBBLE_RESULT_UNKNOWN:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
views::test::WidgetDestroyedWaiter destroyed_waiter(
diff --git a/chrome/browser/ui/views/autofill/payments/webauthn_dialog_view.cc b/chrome/browser/ui/views/autofill/payments/webauthn_dialog_view.cc
index 8830c1ec..38da22e3 100644
--- a/chrome/browser/ui/views/autofill/payments/webauthn_dialog_view.cc
+++ b/chrome/browser/ui/views/autofill/payments/webauthn_dialog_view.cc
@@ -80,7 +80,7 @@
break;
case WebauthnDialogState::kUnknown:
case WebauthnDialogState::kOffer:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/autofill/popup/popup_cell_utils.cc b/chrome/browser/ui/views/autofill/popup/popup_cell_utils.cc
index 0057dbcb..81534305 100644
--- a/chrome/browser/ui/views/autofill/popup/popup_cell_utils.cc
+++ b/chrome/browser/ui/views/autofill/popup/popup_cell_utils.cc
@@ -144,7 +144,7 @@
case Suggestion::Icon::kUndo:
return std::u16string();
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::optional<ui::ImageModel> ImageModelFromImageSkia(
@@ -282,7 +282,7 @@
return ImageModelFromImageSkia(
*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id));
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string GetVoiceOverStringFromSuggestion(const Suggestion& suggestion) {
diff --git a/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils.cc b/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils.cc
index 865988df..83c05d4 100644
--- a/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils.cc
+++ b/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils.cc
@@ -619,7 +619,7 @@
case SuggestionType::kSeparator:
case SuggestionType::kMixedFormMessage:
case SuggestionType::kInsecureContextPaymentDisabledMessage:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case SuggestionType::kPasswordEntry:
case SuggestionType::kAccountStoragePasswordEntry:
return std::make_unique<PopupRowView>(
diff --git a/chrome/browser/ui/views/autofill/popup/popup_view_views.cc b/chrome/browser/ui/views/autofill/popup/popup_view_views.cc
index b8c2e059..ac09190 100644
--- a/chrome/browser/ui/views/autofill/popup/popup_view_views.cc
+++ b/chrome/browser/ui/views/autofill/popup/popup_view_views.cc
@@ -313,7 +313,7 @@
break;
default:
// All Compose SuggestionTypes should already be handled.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -747,7 +747,7 @@
case views::BubbleBorder::Arrow::RIGHT_TOP:
return ArrowPosition::kRightTop;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
};
views::Border* border = GetWidget()->GetRootView()->GetBorder();
diff --git a/chrome/browser/ui/views/autofill/update_address_profile_view.cc b/chrome/browser/ui/views/autofill/update_address_profile_view.cc
index f34cbcb9..10d48fd0 100644
--- a/chrome/browser/ui/views/autofill/update_address_profile_view.cc
+++ b/chrome/browser/ui/views/autofill/update_address_profile_view.cc
@@ -46,7 +46,7 @@
case PHONE_HOME_WHOLE_NUMBER:
return vector_icons::kCallIcon;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 46d0c6c..103252d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1185,7 +1185,7 @@
}
void BookmarkBarView::BookmarkModelBeingDeleted() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void BookmarkBarView::BookmarkNodeMoved(const BookmarkNode* old_parent,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index ea75509..2cedae6 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -164,7 +164,7 @@
case kContextMenuItemNewFolder:
return true;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/browser_commands_views.cc b/chrome/browser/ui/views/browser_commands_views.cc
index c9d34a2..c8cb175 100644
--- a/chrome/browser/ui/views/browser_commands_views.cc
+++ b/chrome/browser/ui/views/browser_commands_views.cc
@@ -72,7 +72,7 @@
PrintViewHierarchy(view, /* verbose= */ true);
break;
default:
- NOTREACHED_NORETURN() << "Unimplemented UI Debug command: " << id;
+ NOTREACHED() << "Unimplemented UI Debug command: " << id;
}
}
diff --git a/chrome/browser/ui/views/certificate_selector.cc b/chrome/browser/ui/views/certificate_selector.cc
index 338fa14..342be6a1 100644
--- a/chrome/browser/ui/views/certificate_selector.cc
+++ b/chrome/browser/ui/views/certificate_selector.cc
@@ -107,7 +107,7 @@
case IDS_CERT_SELECTOR_SERIAL_COLUMN:
return row.serial;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/chrome_layout_provider.cc b/chrome/browser/ui/views/chrome_layout_provider.cc
index ec17e02..f90f4584 100644
--- a/chrome/browser/ui/views/chrome_layout_provider.cc
+++ b/chrome/browser/ui/views/chrome_layout_provider.cc
@@ -163,7 +163,7 @@
case DISTANCE_RICH_HOVER_BUTTON_ICON_HORIZONTAL:
return 8;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int ChromeLayoutProvider::GetSnappedDialogWidth(int min_width) const {
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index b74f37fd..6b5944f4 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -329,23 +329,23 @@
gfx::Size
ConstrainedWebDialogDelegateViews::GetConstrainedWebDialogMinimumSize() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
gfx::Size
ConstrainedWebDialogDelegateViews::GetConstrainedWebDialogMaximumSize() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
gfx::Size
ConstrainedWebDialogDelegateViews::GetConstrainedWebDialogPreferredSize()
const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ConstrainedWebDialogDelegateViews::ResizeToGivenSize(
const gfx::Size size) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ConstrainedDialogWebView::ConstrainedDialogWebView(
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 36f0f3d..57b0d13 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -339,7 +339,7 @@
if ((*i)->GetChecked())
return i - radio_group_.begin();
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ContentSettingBubbleContents::OnThemeChanged() {
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
index 574aa94..29aec7b 100644
--- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
+++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
@@ -103,7 +103,7 @@
IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_EXPORT, slot16);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_delegated_source_list_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_delegated_source_list_view.cc
index 51ed4844..aef5327 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_delegated_source_list_view.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_delegated_source_list_view.cc
@@ -30,7 +30,7 @@
case DesktopMediaList::Type::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string GetButtonText(DesktopMediaList::Type type) {
@@ -46,7 +46,7 @@
case DesktopMediaList::Type::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc
index 0313f33..4061323 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc
@@ -96,7 +96,7 @@
case DesktopMediaList::Type::kCurrentTab:
return false;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void DesktopMediaPaneView::MakePermissionPaneView() {
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm b/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm
index 3c8ea55..947bdde 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm
@@ -66,7 +66,7 @@
case DesktopMediaList::Type::kCurrentTab:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<views::View> MakeToggleAnimation() {
@@ -196,7 +196,7 @@
case DesktopMediaList::Type::kCurrentTab:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
BEGIN_METADATA(DesktopMediaPermissionPaneViewMac)
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
index 8e2011c..d97e978 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
@@ -161,7 +161,7 @@
switch (source_type) {
case DesktopMediaList::Type::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case DesktopMediaList::Type::kScreen:
RecordAction(base::UserMetricsAction("GetDisplayMedia.SelectScreen"));
@@ -241,7 +241,7 @@
case DesktopMediaList::Type::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif // BUILDFLAG(IS_MAC)
@@ -259,7 +259,7 @@
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool AreEquivalentTypesForAudioCheckbox(DesktopMediaList::Type lhs,
@@ -313,7 +313,7 @@
case DesktopMediaList::Type::kCurrentTab:
return display_surface == blink::mojom::PreferredDisplaySurface::BROWSER;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<views::ScrollView> CreateScrollView(bool audio_requested) {
@@ -347,7 +347,7 @@
case DesktopMediaList::Type::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
DesktopMediaPickerDialogView::DisplaySurfaceCategory::DisplaySurfaceCategory(
@@ -445,7 +445,7 @@
for (auto& source_list : source_lists) {
switch (source_list->GetMediaListType()) {
case DesktopMediaList::Type::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case DesktopMediaList::Type::kScreen: {
const DesktopMediaSourceViewStyle kGenericScreenStyle =
DesktopMediaSourceViewStyle(
@@ -810,7 +810,7 @@
: IDS_DESKTOP_MEDIA_PICKER_ALSO_SHARE_SYSTEM_AUDIO);
}
case DesktopMediaList::Type::kWindow:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case DesktopMediaList::Type::kWebContents:
case DesktopMediaList::Type::kCurrentTab:
return l10n_util::GetStringUTF16(
@@ -818,7 +818,7 @@
case DesktopMediaList::Type::kNone:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<views::View> DesktopMediaPickerDialogView::SetupPane(
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc
index ca14839..b3573ad 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc
@@ -98,7 +98,7 @@
case DesktopMediaList::Type::kNone:
return DesktopMediaID::Type::TYPE_NONE;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::string GetTypeAsTestNameString(const DesktopMediaList::Type& type) {
@@ -114,7 +114,7 @@
case DesktopMediaList::Type::kNone:
return "None";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
struct PickerConfiguration {
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc
index 2743803..ec48cde 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc
@@ -155,7 +155,7 @@
}
void TabListModel::OnDelegatedSourceListSelection() {
- NOTREACHED_NORETURN()
+ NOTREACHED()
<< "Tab Lists are not delegated, so should not get a selection event.";
}
diff --git a/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc b/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc
index 9004057..7a179218 100644
--- a/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc
+++ b/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc
@@ -333,7 +333,7 @@
}
#if BUILDFLAG(IS_CHROMEOS)
// On ChromeOS the LookupIconFromFilepath() call should always succeed.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#else
im->LoadIcon(file_path, icon_loader_size, current_scale_,
base::BindOnce(&DownloadBubbleRowView::OnFileIconLoaded,
@@ -1040,7 +1040,7 @@
IDS_DOWNLOAD_BUBBLE_SHOW_IN_FOLDER_QUICK_ACTION_ACCESSIBILITY,
info_->model()->GetFileNameToReportUser().LossyDisplayName());
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1084,7 +1084,7 @@
IDS_DOWNLOAD_BUBBLE_OPEN_MAIN_BUTTON_ACCESSIBILITY,
info_->model()->GetFileNameToReportUser().LossyDisplayName());
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
index c70e36a2..951871f 100644
--- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc
+++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
@@ -144,7 +144,7 @@
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -190,7 +190,7 @@
return l10n_util::GetStringFUTF16(IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS,
filename);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
index 20bd738..3d866d1 100644
--- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
@@ -73,7 +73,7 @@
case Browser::DownloadCloseType::kOk:
// This dialog should have been created within the same thread invocation
// as the original test, so it's never ok to close.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
auto message_label = std::make_unique<views::Label>(
l10n_util::GetStringUTF16(message_id),
diff --git a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc
index d66cec66..eef2987 100644
--- a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc
@@ -48,7 +48,7 @@
FROM_HERE, base::BindOnce(std::move(callback), false));
return;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_button.cc b/chrome/browser/ui/views/extensions/extensions_menu_button.cc
index 8eaf944..1fcc1ff 100644
--- a/chrome/browser/ui/views/extensions/extensions_menu_button.cc
+++ b/chrome/browser/ui/views/extensions/extensions_menu_button.cc
@@ -87,7 +87,7 @@
// The items in the extensions menu are disabled and unclickable if the
// primary action cannot be taken; ShowContextMenuAsFallback() should never
// be called directly.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ExtensionsMenuButton::ButtonPressed() {
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.cc
index 394ec739..75fb4bc 100644
--- a/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.cc
+++ b/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.cc
@@ -100,7 +100,7 @@
return l10n_util::GetStringUTF16(
IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_ALL_SITES_TEXT);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -118,7 +118,7 @@
return l10n_util::GetStringUTF16(
IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_ALL_SITES_DESCRIPTION);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc b/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc
index 43288b7..ea6d946 100644
--- a/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc
+++ b/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc
@@ -149,7 +149,7 @@
SitePermissionsHelper::SiteInteraction::kGranted;
}
case PermissionsManager::UserSiteSetting::kGrantAllExtensions: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_container_interactive_uitest.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_container_interactive_uitest.cc
index e3874da..edc48af 100644
--- a/chrome/browser/ui/views/extensions/extensions_toolbar_container_interactive_uitest.cc
+++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container_interactive_uitest.cc
@@ -119,7 +119,7 @@
action->OnMouseEvent(&click_up_event);
}
- void ShowUi(const std::string& name) override { NOTREACHED_NORETURN(); }
+ void ShowUi(const std::string& name) override { NOTREACHED(); }
void RemoveExtension(ExtensionRemovalMethod method,
const std::string& extension_id) {
diff --git a/chrome/browser/ui/views/flying_indicator.cc b/chrome/browser/ui/views/flying_indicator.cc
index bc2169b0..cf2b8266 100644
--- a/chrome/browser/ui/views/flying_indicator.cc
+++ b/chrome/browser/ui/views/flying_indicator.cc
@@ -159,7 +159,7 @@
widget_->SetOpacity(opacity);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
gfx::Size bubble_size = bubble_size_;
if (opacity < 1.0) {
diff --git a/chrome/browser/ui/views/frame/browser_frame_mac.mm b/chrome/browser/ui/views/frame/browser_frame_mac.mm
index 2d80875e..6763207c 100644
--- a/chrome/browser/ui/views/frame/browser_frame_mac.mm
+++ b/chrome/browser/ui/views/frame/browser_frame_mac.mm
@@ -433,7 +433,7 @@
GetNSWindowHost()->CanGoForward(enabled);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc b/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
index 12d9948..9054c66 100644
--- a/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
@@ -89,6 +89,6 @@
case views::FrameButton::kClose:
return ui::NavButtonProvider::FrameButtonDisplayType::kClose;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native_unittest.cc b/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native_unittest.cc
index cf4c36a..128a3f2 100644
--- a/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native_unittest.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native_unittest.cc
@@ -106,7 +106,7 @@
case ui::NavButtonProvider::FrameButtonDisplayType::kMinimize:
return GetTestImageForSize(kMinimizeButtonSize);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -120,7 +120,7 @@
case ui::NavButtonProvider::FrameButtonDisplayType::kMinimize:
return kMinimizeButtonMargin;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/frame/browser_frame_view_linux_native.cc b/chrome/browser/ui/views/frame/browser_frame_view_linux_native.cc
index 08e33249..49b495c6 100644
--- a/chrome/browser/ui/views/frame/browser_frame_view_linux_native.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_view_linux_native.cc
@@ -27,7 +27,7 @@
case views::Button::STATE_COUNT:
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -124,7 +124,7 @@
case ui::NavButtonProvider::FrameButtonDisplayType::kClose:
return close_button();
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
index af52e49..3f1568d7 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -204,15 +204,15 @@
gfx::Insets BrowserNonClientFrameView::RestoredMirroredFrameBorderInsets()
const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
gfx::Insets BrowserNonClientFrameView::GetInputInsets() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
SkRRect BrowserNonClientFrameView::GetRestoredClipRegion() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int BrowserNonClientFrameView::GetTranslucentTopAreaHeight() const {
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
index 8f6f266a8..9fb0783 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
@@ -47,7 +47,7 @@
case ImmersiveModeController::ANIMATE_REVEAL_NO:
return chromeos::ImmersiveFullscreenController::ANIMATE_REVEAL_NO;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
class ImmersiveRevealedLockChromeos : public ImmersiveRevealedLock {
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc
index 3de4cc4..72452e2 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc
@@ -10,7 +10,7 @@
}
void ImmersiveModeControllerStub::SetEnabled(bool enabled) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool ImmersiveModeControllerStub::IsEnabled() const {
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index df343a9..4c5356d 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -731,7 +731,7 @@
case VIEW_ID_CLOSE_BUTTON:
return (is_rtl ? 0 : minimize_width + maximize_restore_width);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
index 67b69d1..5c82d24 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
@@ -667,7 +667,7 @@
const views::View* host) const {
// This is never used; NonClientView::CalculatePreferredSize() will be called
// instead.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
gfx::Size OpaqueBrowserFrameViewLayout::GetPreferredSize(
@@ -675,7 +675,7 @@
const views::SizeBounds& available_size) const {
// This is never used; NonClientView::CalculatePreferredSize() will be called
// instead.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
diff --git a/chrome/browser/ui/views/frame/windows_caption_button.cc b/chrome/browser/ui/views/frame/windows_caption_button.cc
index e993af9..d8000f80 100644
--- a/chrome/browser/ui/views/frame/windows_caption_button.cc
+++ b/chrome/browser/ui/views/frame/windows_caption_button.cc
@@ -167,7 +167,7 @@
button_display_order = 2;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Reverse the ordering if we're in RTL mode
@@ -241,7 +241,7 @@
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/global_media_controls/media_toolbar_button_contextual_menu.cc b/chrome/browser/ui/views/global_media_controls/media_toolbar_button_contextual_menu.cc
index 9d52b5aa..a735a285 100644
--- a/chrome/browser/ui/views/global_media_controls/media_toolbar_button_contextual_menu.cc
+++ b/chrome/browser/ui/views/global_media_controls/media_toolbar_button_contextual_menu.cc
@@ -100,7 +100,7 @@
break;
#endif
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.cc b/chrome/browser/ui/views/intent_picker_bubble_view.cc
index 156c3fc9..9690adb 100644
--- a/chrome/browser/ui/views/intent_picker_bubble_view.cc
+++ b/chrome/browser/ui/views/intent_picker_bubble_view.cc
@@ -439,7 +439,7 @@
delta = base::i18n::IsRTL() ? -1 : 1;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
SetSelectedAppIndex(CalculateNextAppIndex(delta), nullptr);
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index 8491daf..cbd0429 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -71,7 +71,7 @@
case ImageType::NUM_IMAGE_TYPES:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
index f2f5f46..e5b9ea7 100644
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
@@ -114,7 +114,7 @@
return l10n_util::GetStringUTF16(
IDS_TRACKING_PROTECTION_BUBBLE_MANAGED_PROTECTIONS_LABEL);
case CookieControlsEnforcement::kNoEnforcement:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
} // namespace
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc
index 3cf2849..dbd740cd 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc
@@ -107,7 +107,7 @@
case SHRINKING:
return min + (max - min) * ((1.0 - fraction) / kOpenFraction);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool IsShrinking() const override { return state() == SHRINKING; }
diff --git a/chrome/browser/ui/views/mahi/mahi_menu_view.cc b/chrome/browser/ui/views/mahi/mahi_menu_view.cc
index 2b2a618..7f4699b 100644
--- a/chrome/browser/ui/views/mahi/mahi_menu_view.cc
+++ b/chrome/browser/ui/views/mahi/mahi_menu_view.cc
@@ -351,7 +351,7 @@
// This function only handles clicks of type 'kSummary',
// 'kOutline' and `kSettings`. Other click types are not passed
// here.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
base::UmaHistogramEnumeration(kMahiContextMenuButtonClickHistogram,
histogram_button_type);
diff --git a/chrome/browser/ui/views/media_preview/page_info_previews_coordinator.cc b/chrome/browser/ui/views/media_preview/page_info_previews_coordinator.cc
index 9d21690..759d064 100644
--- a/chrome/browser/ui/views/media_preview/page_info_previews_coordinator.cc
+++ b/chrome/browser/ui/views/media_preview/page_info_previews_coordinator.cc
@@ -27,7 +27,7 @@
// We always expect that `content_settings_type` is either MEDIASTREAM_CAMERA,
// CAMERA_PAN_TILT_ZOOM or MEDIASTREAM_MIC.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ui/views/media_preview/permission_prompt_previews_coordinator.cc b/chrome/browser/ui/views/media_preview/permission_prompt_previews_coordinator.cc
index eff643d4..03d064b9 100644
--- a/chrome/browser/ui/views/media_preview/permission_prompt_previews_coordinator.cc
+++ b/chrome/browser/ui/views/media_preview/permission_prompt_previews_coordinator.cc
@@ -27,7 +27,7 @@
return MediaCoordinator::ViewType::kMicOnly;
}
// We always expect that at least one of the 2 vectors is not empty.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc b/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc
index befb92e7..0a48f202 100644
--- a/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc
+++ b/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc
@@ -116,7 +116,7 @@
case MediaRouterDialogActivationLocation::TOTAL_COUNT:
break;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view.cc b/chrome/browser/ui/views/media_router/cast_dialog_view.cc
index 479f5da..c006cf7 100644
--- a/chrome/browser/ui/views/media_router/cast_dialog_view.cc
+++ b/chrome/browser/ui/views/media_router/cast_dialog_view.cc
@@ -85,7 +85,7 @@
return l10n_util::GetStringUTF16(
IDS_MEDIA_ROUTER_DESKTOP_MIRROR_CAST_MODE);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -188,7 +188,7 @@
cast_mode_set = {MediaCastMode::DESKTOP_MIRROR};
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
AccessCodeCastDialog::Show(
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
index 4482da8..5ba75c2 100644
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -257,13 +257,13 @@
ContentSettingBubbleModelDelegate*
PresentationReceiverWindowView::GetContentSettingBubbleModelDelegate() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void PresentationReceiverWindowView::ExecuteCommandWithDisposition(
int id,
WindowOpenDisposition disposition) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
WebContents* PresentationReceiverWindowView::GetActiveWebContents() const {
diff --git a/chrome/browser/ui/views/message_box_dialog.cc b/chrome/browser/ui/views/message_box_dialog.cc
index 981ba04..dcf78b21f 100644
--- a/chrome/browser/ui/views/message_box_dialog.cc
+++ b/chrome/browser/ui/views/message_box_dialog.cc
@@ -56,7 +56,7 @@
case chrome::MESSAGE_BOX_TYPE_QUESTION:
return flags | MB_YESNO | MB_ICONQUESTION;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
diff --git a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc
index 60aeaf6..58f47f11 100644
--- a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc
+++ b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc
@@ -105,7 +105,7 @@
return true;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
views::View* RequestPinView::GetInitiallyFocusedView() {
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index 2ff9c6d..cab32e8 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -1256,7 +1256,7 @@
break;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// This will actually update the visibility of a control that was just added
diff --git a/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc b/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
index e3baa18..f2d495e9 100644
--- a/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
@@ -462,6 +462,6 @@
return l10n_util::GetStringUTF16(
IDS_TRACKING_PROTECTION_BUBBLE_3PC_LIMITED_SUBTITLE);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
index 4a0a364..9c9b70e 100644
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -529,7 +529,7 @@
presenter_->OpenSiteSettingsView();
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
index 02bb85b..b7c3928 100644
--- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
+++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
@@ -530,7 +530,7 @@
default:
// All other |ContentSettingsType|s do not have icons on desktop or are
// not shown in the Page Info bubble.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return ui::ImageModel::FromVectorIcon(
@@ -563,7 +563,7 @@
default:
// All other content settings types do not represent chosen object
// permissions.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return ui::ImageModel::FromVectorIcon(
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc
index 5a43fe13..14fca0c 100644
--- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc
@@ -339,7 +339,7 @@
case security_state::SafetyTipStatus::kUnknown:
case security_state::SafetyTipStatus::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
content::WebContentsAddedObserver new_tab_observer;
static_cast<views::StyledLabel*>(
diff --git a/chrome/browser/ui/views/page_info/security_information_view.cc b/chrome/browser/ui/views/page_info/security_information_view.cc
index 4112ba3..c2627e21 100644
--- a/chrome/browser/ui/views/page_info/security_information_view.cc
+++ b/chrome/browser/ui/views/page_info/security_information_view.cc
@@ -201,7 +201,7 @@
change_password_template = IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<views::MdTextButton> change_password_button;
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_views.cc b/chrome/browser/ui/views/passwords/manage_passwords_icon_views.cc
index 2ea7efdf..a4ca3f49 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_icon_views.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_views.cc
@@ -167,7 +167,7 @@
return l10n_util::GetStringUTF16(
IDS_PASSWORD_MANAGER_TOOLTIP_KEYCHAIN_ERROR);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ManagePasswordsIconViews::AboutToRequestFocusFromTabTraversal(
diff --git a/chrome/browser/ui/views/passwords/password_bubble_view_base.cc b/chrome/browser/ui/views/passwords/password_bubble_view_base.cc
index 6d4f7cf..89ff20cd 100644
--- a/chrome/browser/ui/views/passwords/password_bubble_view_base.cc
+++ b/chrome/browser/ui/views/passwords/password_bubble_view_base.cc
@@ -165,7 +165,7 @@
view =
new PasskeyUpdatedConfirmationView(web_contents, anchor_view, reason);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
g_manage_passwords_bubble_ = view;
diff --git a/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc b/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc
index b32de19..a9cd08e 100644
--- a/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc
@@ -127,7 +127,7 @@
std::unique_ptr<ui::ComboboxModel>
ContactInfoEditorViewController::GetComboboxModelForType(
const autofill::FieldType& type) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string ContactInfoEditorViewController::GetSheetTitle() {
@@ -265,7 +265,7 @@
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -276,13 +276,13 @@
IsValidCombobox(ValidatingCombobox* combobox,
std::u16string* error_message) {
// This UI doesn't contain any comboboxes.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool ContactInfoEditorViewController::ContactInfoValidationDelegate::
ComboboxValueChanged(ValidatingCombobox* combobox) {
// This UI doesn't contain any comboboxes.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace payments
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
index 573bbc1..4b17753 100644
--- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
@@ -161,7 +161,7 @@
return model;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
index 89e4ca68..2fb0d7e 100644
--- a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
@@ -77,12 +77,12 @@
void PerformSelectionFallback() override {
// Since CanBeSelected() is always true, this should never be called.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void EditButtonPressed() override {
// This subclass doesn't display the edit button.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
mojom::PaymentShippingOptionPtr shipping_option_;
diff --git a/chrome/browser/ui/views/payments/validation_delegate.cc b/chrome/browser/ui/views/payments/validation_delegate.cc
index 9d9ec1c8..8b3c62a 100644
--- a/chrome/browser/ui/views/payments/validation_delegate.cc
+++ b/chrome/browser/ui/views/payments/validation_delegate.cc
@@ -15,7 +15,7 @@
}
std::u16string ValidationDelegate::Format(const std::u16string& text) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace payments
diff --git a/chrome/browser/ui/views/performance_controls/performance_intervention_bubble.cc b/chrome/browser/ui/views/performance_controls/performance_intervention_bubble.cc
index 5a1e949..1811602 100644
--- a/chrome/browser/ui/views/performance_controls/performance_intervention_bubble.cc
+++ b/chrome/browser/ui/views/performance_controls/performance_intervention_bubble.cc
@@ -143,6 +143,6 @@
l10n_util::GetStringUTF16(
IDS_PERFORMANCE_INTERVENTION_DEACTIVATE_TABS_BUTTON_V3)};
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/permissions/chip/permission_prompt_chip_model.cc b/chrome/browser/ui/views/permissions/chip/permission_prompt_chip_model.cc
index d34db74b..62ab9d2 100644
--- a/chrome/browser/ui/views/permissions/chip/permission_prompt_chip_model.cc
+++ b/chrome/browser/ui/views/permissions/chip/permission_prompt_chip_model.cc
@@ -199,7 +199,7 @@
IDS_PERMISSIONS_CAMERA_AND_MICROPHONE_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT;
break;
case permissions::PermissionAction::NUM:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
chip_text_ = delegate_->Requests()[0]
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_two_origins_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_two_origins_view.cc
index c660043..5b789b5 100644
--- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_two_origins_view.cc
+++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_two_origins_view.cc
@@ -193,7 +193,7 @@
return title_string;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
index c1c8f991..2033925 100644
--- a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
+++ b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
@@ -36,7 +36,7 @@
void AcquirePrivateKey(
base::OnceCallback<void(scoped_refptr<net::SSLPrivateKey>)>
private_key_callback) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
};
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc
index e33a5f5..d769ece7 100644
--- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc
+++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc
@@ -72,7 +72,7 @@
using Reason = plugin_vm::PluginVmInstaller::FailureReason;
switch (reason) {
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case Reason::DOWNLOAD_FAILED_401:
return 401;
case Reason::DOWNLOAD_FAILED_403:
@@ -362,7 +362,7 @@
case State::kInstalling:
switch (installing_state_) {
case InstallingState::kInactive:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case InstallingState::kCheckingLicense:
case InstallingState::kCheckingForExistingVm:
case InstallingState::kCheckingDiskSpace:
diff --git a/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.cc b/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.cc
index e74260d0..3f5e795 100644
--- a/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.cc
+++ b/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.cc
@@ -47,7 +47,7 @@
return base_url.Resolve(
chrome::kChromeUIPrivacySandboxDialogNoticeRestrictedPath);
case PrivacySandboxService::PromptType::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -59,7 +59,7 @@
case PrivacySandboxService::PromptType::kM1NoticeRestricted:
return kM1DialogWidth;
case PrivacySandboxService::PromptType::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/profiles/badged_profile_photo.cc b/chrome/browser/ui/views/profiles/badged_profile_photo.cc
index 5c29880..2bb7b8c 100644
--- a/chrome/browser/ui/views/profiles/badged_profile_photo.cc
+++ b/chrome/browser/ui/views/profiles/badged_profile_photo.cc
@@ -103,7 +103,7 @@
kSyncPausedCircleIcon, ui::kColorIcon, kBadgeIconSize));
break;
case BadgedProfilePhoto::BADGE_TYPE_NONE:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
SizeToPreferredSize();
}
diff --git a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc
index b33bdeb..91a5932 100644
--- a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc
+++ b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc
@@ -81,7 +81,7 @@
case WebSigninInterceptor::SigninInterceptionType::kProfileSwitchForced:
// These intercept type do not show a bubble and should not need to change
// the identity pill text.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -106,7 +106,7 @@
case WebSigninInterceptor::SigninInterceptionType::kProfileSwitchForced:
// These intercept type do not show a bubble and should not need to change
// the identity pill text.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -140,8 +140,8 @@
case SigninInterceptionResult::kAcceptedWithExistingProfile:
case SigninInterceptionResult::kIgnored:
case SigninInterceptionResult::kNotDisplayed:
- NOTREACHED_NORETURN() << "These results should not be recorded or not "
- "expected for the Chrome Signin Bubble.";
+ NOTREACHED() << "These results should not be recorded or not "
+ "expected for the Chrome Signin Bubble.";
}
}
diff --git a/chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.cc b/chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.cc
index 32a065d..0514f7f 100644
--- a/chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.cc
+++ b/chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.cc
@@ -225,8 +225,8 @@
}
void FirstRunFlowControllerLacros::CancelPostSignInFlow() {
- NOTREACHED_NORETURN(); // The whole Lacros FRE is post-sign-in, it's not
- // cancellable.
+ NOTREACHED(); // The whole Lacros FRE is post-sign-in, it's not
+ // cancellable.
}
bool FirstRunFlowControllerLacros::PreFinishWithBrowser() {
diff --git a/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc b/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc
index 99e841d3..e27e354 100644
--- a/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc
+++ b/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc
@@ -132,7 +132,7 @@
case SyncButtonsFeatureConfig::kDeadlined:
return ::signin_metrics::SyncButtonClicked::kSyncOptInEqualWeighted;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -145,7 +145,7 @@
case SyncButtonsFeatureConfig::kDeadlined:
return ::signin_metrics::SyncButtonClicked::kSyncCancelEqualWeighted;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/profiles/managed_user_profile_notice_ui_browsertest.cc b/chrome/browser/ui/views/profiles/managed_user_profile_notice_ui_browsertest.cc
index 5a4145a..c5b4cbe 100644
--- a/chrome/browser/ui/views/profiles/managed_user_profile_notice_ui_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/managed_user_profile_notice_ui_browsertest.cc
@@ -97,7 +97,7 @@
weak_ptr_factory_.GetWeakPtr(), std::move(step_shown_callback)));
}
- void OnNavigateBackRequested() override { NOTREACHED_NORETURN(); }
+ void OnNavigateBackRequested() override { NOTREACHED(); }
void OnManagedUserNoticeLoaded(
StepSwitchFinishedCallback step_shown_callback) {
diff --git a/chrome/browser/ui/views/profiles/profile_management_step_controller.cc b/chrome/browser/ui/views/profiles/profile_management_step_controller.cc
index 8611813..bc7130a 100644
--- a/chrome/browser/ui/views/profiles/profile_management_step_controller.cc
+++ b/chrome/browser/ui/views/profiles/profile_management_step_controller.cc
@@ -280,7 +280,7 @@
void OnNavigateBackRequested() override {
// Do nothing, navigating back is not allowed.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
@@ -348,7 +348,7 @@
void OnNavigateBackRequested() override {
// Do nothing, navigating back is not allowed.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
diff --git a/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc b/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
index 38e38d6e..ce7e02f 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
@@ -62,7 +62,7 @@
} else {
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Note: on Ash, only incognito windows have a profile menu.
- NOTREACHED_NORETURN() << "The profile menu is not implemented on Ash.";
+ NOTREACHED() << "The profile menu is not implemented on Ash.";
#else
bubble = std::make_unique<ProfileMenuView>(avatar_toolbar_button, &browser);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc
index 880f012..11a42517 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -733,7 +733,7 @@
} else {
#if BUILDFLAG(IS_CHROMEOS_ASH)
// There is always an account on ChromeOS.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#else
// Not signed in state.
if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) {
diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
index 1c5093a..a650dca6 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
@@ -47,7 +47,7 @@
}
std::u16string ProfilePickerFeaturePromoController::GetBodyIconAltText() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
const base::Feature*
@@ -63,7 +63,7 @@
std::u16string
ProfilePickerFeaturePromoController::GetTutorialScreenReaderHint() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::u16string
diff --git a/chrome/browser/ui/views/profiles/profile_picker_flow_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_flow_controller.cc
index 0a0410a..7fa0be4 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_flow_controller.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_flow_controller.cc
@@ -86,7 +86,7 @@
case ProfilePicker::EntryPoint::kLacrosPrimaryProfileFirstRun:
case ProfilePicker::EntryPoint::kFirstRun:
// Should not be used for this entry point.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -496,7 +496,7 @@
case ProfilePicker::EntryPoint::kLacrosSelectAvailableAccount:
case ProfilePicker::EntryPoint::kLacrosPrimaryProfileFirstRun:
case ProfilePicker::EntryPoint::kFirstRun:
- NOTREACHED_NORETURN()
+ NOTREACHED()
<< "CancelPostSignInFlow() is not reachable from this entry point";
}
}
diff --git a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc
index 7bcb7a6b..735e6ce 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc
@@ -52,7 +52,7 @@
#endif
default:
- NOTREACHED_NORETURN() << "Unexpected command_id: " << command_id;
+ NOTREACHED() << "Unexpected command_id: " << command_id;
}
}
diff --git a/chrome/browser/ui/views/profiles/profile_picker_turn_sync_on_delegate.cc b/chrome/browser/ui/views/profiles/profile_picker_turn_sync_on_delegate.cc
index d0001e0..67f460a 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_turn_sync_on_delegate.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_turn_sync_on_delegate.cc
@@ -119,7 +119,7 @@
const std::string& new_email,
signin::SigninChoiceCallback callback) {
// A brand new profile cannot have a conflict in sync accounts.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ProfilePickerTurnSyncOnDelegate::ShowEnterpriseAccountConfirmation(
@@ -201,7 +201,7 @@
void ProfilePickerTurnSyncOnDelegate::SwitchToProfile(Profile* new_profile) {
// A brand new profile cannot have preexisting syncable data and thus
// switching to another profile does never get offered.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void ProfilePickerTurnSyncOnDelegate::OnSyncConfirmationUIClosed(
@@ -318,9 +318,8 @@
break;
case ManagedUserProfileNoticeUI::ScreenType::kEnterpriseOIDC:
case ManagedUserProfileNoticeUI::ScreenType::kEnterpriseAccountCreation:
- NOTREACHED_NORETURN()
- << "The profile picker should not show a managed user "
- "notice that prompts for profile creation";
+ NOTREACHED() << "The profile picker should not show a managed user "
+ "notice that prompts for profile creation";
}
}
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view.cc b/chrome/browser/ui/views/profiles/profile_picker_view.cc
index b913aef2..ce20a6e2 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view.cc
@@ -1015,7 +1015,7 @@
#endif
default:
- NOTREACHED_NORETURN() << "Unexpected command_id: " << command_id;
+ NOTREACHED() << "Unexpected command_id: " << command_id;
}
return true;
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc b/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc
index fe329319..22763a9c 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc
@@ -92,7 +92,7 @@
std::move(initial_step_load_finished_closure_).Run();
}
- void CancelPostSignInFlow() override { NOTREACHED_NORETURN(); }
+ void CancelPostSignInFlow() override { NOTREACHED(); }
Step step_;
ProfileManagementStepTestView::StepControllerFactory step_controller_factory_;
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
index 2d19327..4b659a23 100644
--- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
+++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
@@ -417,8 +417,7 @@
modal_signin_widget_->GetNativeWindow(), host_web_contents);
break;
default:
- NOTREACHED_NORETURN()
- << "Unsupported dialog modal type " << GetModalType();
+ NOTREACHED() << "Unsupported dialog modal type " << GetModalType();
}
DCHECK(modal_signin_widget_);
diff --git a/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc b/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc
index 141165e..3bf5a21 100644
--- a/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc
@@ -173,7 +173,7 @@
weak_ptr_factory_.GetWeakPtr(), std::move(step_shown_callback)));
}
- void OnNavigateBackRequested() override { NOTREACHED_NORETURN(); }
+ void OnNavigateBackRequested() override { NOTREACHED(); }
void OnSyncConfirmationLoaded(
StepSwitchFinishedCallback step_shown_callback) {
diff --git a/chrome/browser/ui/views/promos/ios_promo_bubble.cc b/chrome/browser/ui/views/promos/ios_promo_bubble.cc
index c60993f..2aaea5d 100644
--- a/chrome/browser/ui/views/promos/ios_promo_bubble.cc
+++ b/chrome/browser/ui/views/promos/ios_promo_bubble.cc
@@ -258,7 +258,7 @@
IDS_IOS_DESKTOP_ADDRESS_PROMO_BUBBLE_BUTTON_DECLINE;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return IOSPromoConfig;
}
diff --git a/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc b/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc
index bc0fb87..065ce096 100644
--- a/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc
+++ b/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc
@@ -35,7 +35,7 @@
// DialogBrowserTest
void ShowUi(const std::string& name) override {
// Set a dummy value of 1 in promo impressions otherwise a
- // NOTREACHED_NORETURN() is hit.
+ // NOTREACHED() is hit.
PrefService* prefs = chrome_test_utils::GetProfile(this)->GetPrefs();
prefs->SetInteger(promos_prefs::kiOSPasswordPromoImpressionsCounter, 1);
diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
index c88a77a..5e34ee23 100644
--- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
+++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -282,7 +282,7 @@
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
return false;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
default:
return false;
@@ -294,7 +294,7 @@
switch (command_id) {
case IDC_WRITING_DIRECTION_DEFAULT:
// WebKit's current behavior is for this menu item to always be disabled.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case IDC_WRITING_DIRECTION_RTL:
case IDC_WRITING_DIRECTION_LTR: {
diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
index acad3a9..f169eeec 100644
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
@@ -281,7 +281,7 @@
Close();
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index b404de3..f6b02fb 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -609,7 +609,7 @@
listener_->MultiFilesSelected(selection_files);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc
index b379dff4..0ea4af8 100644
--- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc
+++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc
@@ -109,8 +109,7 @@
signin_metrics::AccessPoint::ACCESS_POINT_SEND_TAB_TO_SELF_PROMO,
/*email_hint=*/std::string());
#else
- NOTREACHED_NORETURN()
- << "The promo bubble shouldn't show if dice-support is disabled";
+ NOTREACHED() << "The promo bubble shouldn't show if dice-support is disabled";
#endif
}
diff --git a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog.cc b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog.cc
index 0958bc1..a3a524a 100644
--- a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog.cc
+++ b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog.cc
@@ -69,7 +69,7 @@
case CONTENT_SETTING_BLOCK:
return 2;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/site_data/site_data_row_view.cc b/chrome/browser/ui/views/site_data/site_data_row_view.cc
index fa933ac..9c7ae5a 100644
--- a/chrome/browser/ui/views/site_data/site_data_row_view.cc
+++ b/chrome/browser/ui/views/site_data/site_data_row_view.cc
@@ -77,7 +77,7 @@
case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
case CONTENT_SETTING_NUM_SETTINGS:
// Not supported settings for cookies.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return l10n_util::GetStringUTF16(message_id);
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
index 828bb34..dbd58b2 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
@@ -155,7 +155,7 @@
case base::nix::DESKTOP_ENVIRONMENT_LXQT:
return false;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
base::FilePath WriteIconFile(size_t icon_file_id,
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
index f026230d..09d5cd4 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
@@ -135,7 +135,7 @@
menu_model_ = nullptr;
return;
case kTypeNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
index ea6ca84a..c57d808 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
@@ -150,7 +150,7 @@
VLOG(1) << "Unable to successfully run RegisterCallbackLegacy.";
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return std::move(notify_item_);
diff --git a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc
index 5760454..c569292 100644
--- a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc
@@ -77,7 +77,7 @@
os << "kParentPermissionFailed";
return os;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -237,7 +237,7 @@
harness_.ShowUi(test_extension_.get(), browser());
return;
} else {
- NOTREACHED_NORETURN() << "Check the suffix of the test name.";
+ NOTREACHED() << "Check the suffix of the test name.";
}
}
diff --git a/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc b/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc
index 6bb3150c..5df128f 100644
--- a/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc
+++ b/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc
@@ -107,7 +107,7 @@
view_->AcceptDialog();
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/chrome/browser/ui/views/tabs/alert_indicator_button.cc b/chrome/browser/ui/views/tabs/alert_indicator_button.cc
index a6049c49..9fbf958 100644
--- a/chrome/browser/ui/views/tabs/alert_indicator_button.cc
+++ b/chrome/browser/ui/views/tabs/alert_indicator_button.cc
@@ -111,7 +111,7 @@
return AlertIndicatorButton::GetTabAlertIndicatorImage(alert_state,
button_color);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
@@ -455,7 +455,7 @@
return AlertIndicatorButton::GetTabAlertIndicatorImage(
alert_state, kColorHoverCardTabAlertAudioPlayingIcon);
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void AlertIndicatorButton::UpdateIconForAlertState(TabAlertState state) {
diff --git a/chrome/browser/ui/views/tabs/compound_tab_container.cc b/chrome/browser/ui/views/tabs/compound_tab_container.cc
index fac860a..2eef0ad8 100644
--- a/chrome/browser/ui/views/tabs/compound_tab_container.cc
+++ b/chrome/browser/ui/views/tabs/compound_tab_container.cc
@@ -62,17 +62,17 @@
}
bool IsGroupCollapsed(const tab_groups::TabGroupId& group) const override {
- NOTREACHED_NORETURN(); // Pinned container can't have groups.
+ NOTREACHED(); // Pinned container can't have groups.
}
std::optional<int> GetFirstTabInGroup(
const tab_groups::TabGroupId& group) const override {
- NOTREACHED_NORETURN(); // Pinned container can't have groups.
+ NOTREACHED(); // Pinned container can't have groups.
}
gfx::Range ListTabsInGroup(
const tab_groups::TabGroupId& group) const override {
- NOTREACHED_NORETURN(); // Pinned container can't have groups.
+ NOTREACHED(); // Pinned container can't have groups.
}
bool CanExtendDragHandle() const override {
@@ -359,7 +359,7 @@
Tab* CompoundTabContainer::RemoveTabFromViewModel(int model_index) {
// TODO(crbug.com/40882151): This only needs to be implemented in
// TabContainerImpl.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
Tab* CompoundTabContainer::AddTabToViewModel(Tab* tab,
@@ -367,7 +367,7 @@
TabPinned pinned) {
// TODO(crbug.com/40882151): This only needs to be implemented in
// TabContainerImpl.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CompoundTabContainer::ReturnTabSlotView(TabSlotView* view) {
@@ -536,13 +536,13 @@
CompoundTabContainer::GetLeadingElementForZOrdering() const {
// TODO(crbug.com/40882151): This only needs to be implemented in
// TabContainerImpl.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::optional<ZOrderableTabContainerElement>
CompoundTabContainer::GetTrailingElementForZOrdering() const {
// TODO(crbug.com/40882151): This only needs to be implemented in
// TabContainerImpl.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CompoundTabContainer::OnTabSlotAnimationProgressed(TabSlotView* view) {
@@ -552,7 +552,7 @@
void CompoundTabContainer::OnTabCloseAnimationCompleted(Tab* tab) {
// TODO(crbug.com/40882151): This only needs to be implemented in
// TabContainerImpl.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CompoundTabContainer::InvalidateIdealBounds() {
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index a5be0ef..77d97c0 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -523,7 +523,7 @@
kVariableTimer);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 8d85987..dd70b68 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -648,7 +648,7 @@
#if BUILDFLAG(IS_CHROMEOS)
return SendTouchEventsSync(ui_controls::kTouchPress, id, location);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -669,7 +669,7 @@
#if BUILDFLAG(IS_CHROMEOS)
return SendTouchEventsSync(ui_controls::kTouchMove, 0, location);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -683,7 +683,7 @@
return ui_controls::SendTouchEvents(ui_controls::kTouchMove, 0,
location.x(), location.y());
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -708,7 +708,7 @@
ui_controls::kTouchMove, 0, location.x(), location.y(),
std::move(task));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -725,7 +725,7 @@
: SendTouchEventsSync(ui_controls::kTouchRelease, id,
gfx::Point());
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -766,7 +766,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
return SendTouchEventsSync(ui_controls::kTouchMove, 0, location);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index cc8337e..a247d2f 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2012,7 +2012,7 @@
std::optional<BrowserRootView::DropIndex> TabStrip::GetDropIndex(
const ui::DropTargetEvent& event) {
// BrowserView should talk directly to |tab_container_| instead of asking us.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
BrowserRootView::DropTarget* TabStrip::GetDropTarget(
@@ -2022,7 +2022,7 @@
views::View* TabStrip::GetViewForDrop() {
// BrowserView should talk directly to |tab_container_| instead of asking us.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc b/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc
index 9cbcd3c2..02a41d99 100644
--- a/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc
@@ -109,7 +109,7 @@
CalculateBaseScrollOffset() * -3, 0.0));
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/tabs/tab_strip_scrolling_overflow_indicator_strategy.cc b/chrome/browser/ui/views/tabs/tab_strip_scrolling_overflow_indicator_strategy.cc
index 7cfc93d7..7692955a 100644
--- a/chrome/browser/ui/views/tabs/tab_strip_scrolling_overflow_indicator_strategy.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip_scrolling_overflow_indicator_strategy.cc
@@ -60,7 +60,7 @@
return std::make_unique<ShadowOverflowIndicatorStrategy>(
scroll_view, get_frame_color, get_shadow_color);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
index ae46659..e61b8885 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
@@ -57,7 +57,7 @@
title_id = IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_TITLE_REQUESTS_ACCESS;
break;
case HoverCardState::SiteAccess::kExtensionDoesNotWantAccess:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return l10n_util::GetStringUTF16(title_id);
}
@@ -83,7 +83,7 @@
IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_DESCRIPTION_EXTENSION_REQUESTS_ACCESS;
break;
case HoverCardState::SiteAccess::kExtensionDoesNotWantAccess:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return l10n_util::GetStringFUTF16(title_id, host);
}
@@ -100,7 +100,7 @@
IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_POLICY_LABEL_INSTALLED_TEXT;
break;
case HoverCardState::AdminPolicy::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return l10n_util::GetStringUTF16(text_id);
}
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index cc2e9f0..36ba4fc 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -238,7 +238,7 @@
case ButtonState::STATE_NORMAL:
return color_provider->GetColor(kColorToolbarButtonIcon);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
index 5c8829f..cc0f02f 100644
--- a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
+++ b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
@@ -355,7 +355,7 @@
border_animation_.GetCurrentValue(), GetBorderOvershootYDelta(), 0);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
border_view_->SetY(GetBorderStartingY() + border_y_delta);
@@ -389,7 +389,7 @@
case TabCounterAnimationType::kDecreasing:
return -kBorderBounceDistance;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -401,7 +401,7 @@
case TabCounterAnimationType::kDecreasing:
return kBorderBounceOvershoot;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -412,7 +412,7 @@
case TabCounterAnimationType::kDecreasing:
return kOffscreenLabelDistance;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -690,7 +690,7 @@
tab_strip_model_->delegate()->AddTabAt(GURL(), -1, true);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc b/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc
index a6cbca62..59f10ff8 100644
--- a/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc
@@ -162,7 +162,7 @@
ShowTranslated();
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -325,7 +325,7 @@
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -392,7 +392,7 @@
case PartialTranslateBubbleModel::VIEW_STATE_TARGET_LANGUAGE:
return advanced_view_target_;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void PartialTranslateBubbleView::ShowTranslated() {
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
index f2309f1d..39c85ae 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -346,7 +346,7 @@
case OptionsMenuItem::ALWAYS_TRANSLATE_LANGUAGE:
return should_always_translate_;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -402,7 +402,7 @@
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -471,7 +471,7 @@
case TranslateBubbleModel::VIEW_STATE_TARGET_LANGUAGE:
return advanced_view_target_;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void TranslateBubbleView::Translate() {
diff --git a/chrome/browser/ui/views/user_education/browser_help_bubble_event_relay.cc b/chrome/browser/ui/views/user_education/browser_help_bubble_event_relay.cc
index d05c199..52eb69f 100644
--- a/chrome/browser/ui/views/user_education/browser_help_bubble_event_relay.cc
+++ b/chrome/browser/ui/views/user_education/browser_help_bubble_event_relay.cc
@@ -47,7 +47,7 @@
#elif BUILDFLAG(IS_MAC)
return std::make_unique<WindowHelpBubbleEventRelayMac>(source_widget);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_navigation_button_container.cc b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_navigation_button_container.cc
index c16661d..0fe2a451 100644
--- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_navigation_button_container.cc
+++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_navigation_button_container.cc
@@ -122,7 +122,7 @@
reload_button_->SetEnabled(enabled);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
index 06f4519e..dd0017b 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -1106,7 +1106,7 @@
break;
}
case UpdateDialogResponse::kSkipDialog:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1865,7 +1865,7 @@
void WebAppIntegrationTestDriver::LaunchFromPlatformShortcut(Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateChangeAction(__FUNCTION__)) {
return;
@@ -1976,7 +1976,7 @@
void WebAppIntegrationTestDriver::OpenAppSettingsFromAppMenu(Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateChangeAction(__FUNCTION__)) {
return;
@@ -2010,7 +2010,7 @@
void WebAppIntegrationTestDriver::OpenAppSettingsFromChromeApps(Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateChangeAction(__FUNCTION__)) {
return;
@@ -2036,7 +2036,7 @@
void WebAppIntegrationTestDriver::OpenAppSettingsFromCommand(Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateChangeAction(__FUNCTION__)) {
return;
@@ -2056,7 +2056,7 @@
void WebAppIntegrationTestDriver::CreateShortcutsFromList(Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else // !BUILDFLAG(IS_CHROMEOS)
if (!BeforeStateChangeAction(__FUNCTION__)) {
return;
@@ -2114,7 +2114,7 @@
Profile* profile,
const AppState& app_state) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
auto app_management_page_handler = CreateAppManagementPageHandler(profile);
@@ -2573,7 +2573,7 @@
void WebAppIntegrationTestDriver::UninstallFromAppSettings(Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateChangeAction(__FUNCTION__)) {
return;
@@ -2715,7 +2715,7 @@
site_remember_deny_open_file_.erase(site);
AfterStateChangeAction();
#else
- NOTREACHED_NORETURN() << "Not supported on non-Windows platforms";
+ NOTREACHED() << "Not supported on non-Windows platforms";
#endif
}
@@ -3007,7 +3007,7 @@
void WebAppIntegrationTestDriver::CheckBrowserNavigationIsAppSettings(
Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
@@ -3484,7 +3484,7 @@
void WebAppIntegrationTestDriver::CheckUserCannotSetRunOnOsLoginAppSettings(
Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
@@ -3517,7 +3517,7 @@
void WebAppIntegrationTestDriver::CheckUserCannotSetRunOnOsLoginAppHome(
Site site) {
#if BUILDFLAG(IS_CHROMEOS)
- NOTREACHED_NORETURN() << "Not implemented on Chrome OS.";
+ NOTREACHED() << "Not implemented on Chrome OS.";
#else
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
@@ -4840,16 +4840,16 @@
}
void WebAppIntegrationTest::SyncTurnOff() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void WebAppIntegrationTest::SyncTurnOn() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void WebAppIntegrationTest::AwaitWebAppQuiescence() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
Profile* WebAppIntegrationTest::GetProfileClient(ProfileClient client) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace web_app::integration_tests
diff --git a/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc b/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc
index 7e6abf8..86bcdb4 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc
+++ b/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc
@@ -231,7 +231,7 @@
case ui::DIALOG_BUTTON_CANCEL:
return true; // Cancel is always enabled if visible.
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
views::View* AuthenticatorRequestDialogView::GetInitiallyFocusedView() {
@@ -270,7 +270,7 @@
void AuthenticatorRequestDialogView::OnModelDestroyed(
AuthenticatorRequestDialogModel* model) {
- NOTREACHED_NORETURN() << "The model should outlive this view.";
+ NOTREACHED() << "The model should outlive this view.";
}
void AuthenticatorRequestDialogView::OnStepTransition() {
diff --git a/chrome/browser/ui/views/webauthn/sheet_view_factory.cc b/chrome/browser/ui/views/webauthn/sheet_view_factory.cc
index bb50e8a..b0e0bf4 100644
--- a/chrome/browser/ui/views/webauthn/sheet_view_factory.cc
+++ b/chrome/browser/ui/views/webauthn/sheet_view_factory.cc
@@ -204,7 +204,7 @@
dialog_model));
break;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
case Step::kOffTheRecordInterstitial:
sheet_view = std::make_unique<AuthenticatorRequestSheetView>(
@@ -402,8 +402,7 @@
sheet_view = std::make_unique<AuthenticatorTouchIdView>(
std::make_unique<AuthenticatorTouchIdSheetModel>(dialog_model));
} else {
- NOTREACHED_NORETURN()
- << "MacOS version does not support LAAuthenticationView";
+ NOTREACHED() << "MacOS version does not support LAAuthenticationView";
}
#else
sheet_view = std::make_unique<AuthenticatorRequestSheetView>(
diff --git a/chrome/browser/ui/web_applications/web_app_browser_controller.cc b/chrome/browser/ui/web_applications/web_app_browser_controller.cc
index 720817f..8ad180bb 100644
--- a/chrome/browser/ui/web_applications/web_app_browser_controller.cc
+++ b/chrome/browser/ui/web_applications/web_app_browser_controller.cc
@@ -267,7 +267,7 @@
return AppShimRegistry::Get()->GetInstalledProfilesForApp(app_id()).size() >
1;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
#endif // !BUILDFLAG(IS_CHROMEOS)
diff --git a/chrome/browser/ui/webauthn/authenticator_request_window.cc b/chrome/browser/ui/webauthn/authenticator_request_window.cc
index 6aee198..b8090521 100644
--- a/chrome/browser/ui/webauthn/authenticator_request_window.cc
+++ b/chrome/browser/ui/webauthn/authenticator_request_window.cc
@@ -255,7 +255,7 @@
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
content::NavigationController::LoadURLParams load_params(url);
diff --git a/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc
index 0fbd1e5..d945db8 100644
--- a/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc
@@ -64,7 +64,7 @@
std::string EnrollmentModeToUIMode(policy::EnrollmentConfig::Mode mode) {
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:
diff --git a/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler.cc b/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler.cc
index d800cac..e94b106 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler.cc
+++ b/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler.cc
@@ -126,7 +126,7 @@
case apps::PermissionType::kStorage:
case apps::PermissionType::kPrinting:
case apps::PermissionType::kFileHandling:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ash::NewWindowDelegate::GetPrimary()->OpenUrl(
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 4fcb58b..bf17828 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -125,7 +125,7 @@
case UserActionBuckets::kOpenInMacPreview:
return mojom::PrinterType::kLocal;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -239,7 +239,7 @@
case mojom::PrinterType::kLocal:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
if (settings.FindBool(kSettingShowSystemDialog).value_or(false))
@@ -1199,7 +1199,7 @@
}
return local_printer_handler_.get();
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
PdfPrinterHandler* PrintPreviewHandler::GetPdfPrinterHandler() {
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc b/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc
index 0c2e55a..2ba9940 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc
@@ -199,7 +199,7 @@
break;
case mojom::PrinterType::kPrivetDeprecated:
case mojom::PrinterType::kCloudDeprecated:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
base::UmaHistogramCustomTimes(
base::StrCat({"PrintPreview.GetPrintersTime.", printer_type_metric}),
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index 05cce84..3b33e13 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -259,7 +259,7 @@
case ChromeSigninUserChoice::kDoNotSignin:
return ChromeSigninSettingModification::kToDoNotSignin;
case ChromeSigninUserChoice::kNoChoice:
- NOTREACHED_NORETURN() << "No choice is not expected as a modification";
+ NOTREACHED() << "No choice is not expected as a modification";
}
}
#endif
diff --git a/chrome/browser/ui/webui/signin/signin_ui_error.cc b/chrome/browser/ui/webui/signin/signin_ui_error.cc
index 3c53732..a9702886 100644
--- a/chrome/browser/ui/webui/signin/signin_ui_error.cc
+++ b/chrome/browser/ui/webui/signin/signin_ui_error.cc
@@ -168,6 +168,6 @@
l10n_util::GetStringUTF16(
IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_TIMEOUT_BODY)};
case ReauthUIError::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/ui/webui/signin/signin_utils.cc b/chrome/browser/ui/webui/signin/signin_utils.cc
index aff81df..fd25488 100644
--- a/chrome/browser/ui/webui/signin/signin_utils.cc
+++ b/chrome/browser/ui/webui/signin/signin_utils.cc
@@ -63,7 +63,7 @@
base::TimeDelta GetMinorModeRestrictionsDeadline() {
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
// Not implemented for those platforms.
- NOTREACHED_NORETURN();
+ NOTREACHED();
#else
return base::Milliseconds(kMinorModeRestrictionsFetchDeadlineMs);
#endif
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
index d5eab08..c99085df 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
@@ -122,7 +122,7 @@
// Metric is not emitted for these cases:
case SyncConfirmationScreenMode::kUnsupported:
case SyncConfirmationScreenMode::kPending:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
} // namespace
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.cc b/chrome/browser/ui/webui/whats_new/whats_new_util.cc
index e7364b3..475cf74 100644
--- a/chrome/browser/ui/webui/whats_new/whats_new_util.cc
+++ b/chrome/browser/ui/webui/whats_new/whats_new_util.cc
@@ -108,7 +108,7 @@
return net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL), "auto",
"true");
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/chrome/browser/usb/usb_pinned_notification_unittest.cc b/chrome/browser/usb/usb_pinned_notification_unittest.cc
index 667cd6d..2529b65 100644
--- a/chrome/browser/usb/usb_pinned_notification_unittest.cc
+++ b/chrome/browser/usb/usb_pinned_notification_unittest.cc
@@ -40,7 +40,7 @@
return l10n_util::GetPluralStringFUTF16(IDS_WEBUSB_SYSTEM_TRAY_ICON_TITLE,
static_cast<int>(num_connections));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
@@ -102,7 +102,7 @@
extension_names[0].c_str(), extension_names[1].c_str(),
extension_names.size() - 2));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
};
diff --git a/chrome/browser/usb/usb_status_icon_unittest.cc b/chrome/browser/usb/usb_status_icon_unittest.cc
index ff1ed77..7ad8078 100644
--- a/chrome/browser/usb/usb_status_icon_unittest.cc
+++ b/chrome/browser/usb/usb_status_icon_unittest.cc
@@ -44,7 +44,7 @@
return l10n_util::GetPluralStringFUTF16(IDS_WEBUSB_SYSTEM_TRAY_ICON_TITLE,
static_cast<int>(num_connections));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
diff --git a/chrome/browser/usb/usb_system_tray_icon.cc b/chrome/browser/usb/usb_system_tray_icon.cc
index 6ef25c4..588b088 100644
--- a/chrome/browser/usb/usb_system_tray_icon.cc
+++ b/chrome/browser/usb/usb_system_tray_icon.cc
@@ -27,7 +27,7 @@
return l10n_util::GetPluralStringFUTF16(IDS_WEBUSB_SYSTEM_TRAY_ICON_TITLE,
static_cast<int>(num_connections));
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
}
diff --git a/chrome/browser/user_education/user_education_configuration_provider.cc b/chrome/browser/user_education/user_education_configuration_provider.cc
index b55aebc..933373b 100644
--- a/chrome/browser/user_education/user_education_configuration_provider.cc
+++ b/chrome/browser/user_education/user_education_configuration_provider.cc
@@ -102,7 +102,7 @@
case user_education::FeaturePromoSpecification::PromoType::kUnspecified:
// Should never get here.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// All IPH block all other IPH.
diff --git a/chrome/browser/vr/browser_renderer_unittest.cc b/chrome/browser/vr/browser_renderer_unittest.cc
index f0c5a186..1f9198086 100644
--- a/chrome/browser/vr/browser_renderer_unittest.cc
+++ b/chrome/browser/vr/browser_renderer_unittest.cc
@@ -59,8 +59,8 @@
}
bool PreRender() override { return true; }
void PostRender() override {}
- gfx::GpuMemoryBufferHandle GetTexture() override { NOTREACHED_NORETURN(); }
- gpu::SyncToken GetSyncToken() override { NOTREACHED_NORETURN(); }
+ gfx::GpuMemoryBufferHandle GetTexture() override { NOTREACHED(); }
+ gpu::SyncToken GetSyncToken() override { NOTREACHED(); }
void ResetMemoryBuffer() override {}
bool BindContext() override { return true; }
void ClearContext() override {}
diff --git a/chrome/browser/vr/test/xr_browser_test.cc b/chrome/browser/vr/test/xr_browser_test.cc
index e872fc86..f7b1dd3 100644
--- a/chrome/browser/vr/test/xr_browser_test.cc
+++ b/chrome/browser/vr/test/xr_browser_test.cc
@@ -220,7 +220,7 @@
void XrBrowserTestBase::OpenNewTab(const std::string& url, bool incognito) {
#if BUILDFLAG(IS_ANDROID)
- NOTREACHED_NORETURN();
+ NOTREACHED();
#else
if (incognito) {
OpenURLOffTheRecord(browser()->profile(), GURL(url));
diff --git a/chrome/browser/web_applications/commands/manifest_update_check_command.cc b/chrome/browser/web_applications/commands/manifest_update_check_command.cc
index 5559b03..409f9ef 100644
--- a/chrome/browser/web_applications/commands/manifest_update_check_command.cc
+++ b/chrome/browser/web_applications/commands/manifest_update_check_command.cc
@@ -588,7 +588,7 @@
case ManifestUpdateCheckResult::kCancelledDueToMainFrameNavigation:
return CommandResult::kFailure;
case ManifestUpdateCheckResult::kSystemShutdown:
- NOTREACHED_NORETURN() << "This should be handled by OnShutdown()";
+ NOTREACHED() << "This should be handled by OnShutdown()";
}
}();
diff --git a/chrome/browser/web_applications/commands/run_on_os_login_command.cc b/chrome/browser/web_applications/commands/run_on_os_login_command.cc
index 015a8b7..e6820f2 100644
--- a/chrome/browser/web_applications/commands/run_on_os_login_command.cc
+++ b/chrome/browser/web_applications/commands/run_on_os_login_command.cc
@@ -108,7 +108,7 @@
RecordCompletionState(aborted_state);
switch (aborted_state) {
case RunOnOsLoginCommandCompletionState::kCommandSystemShutDown:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case RunOnOsLoginCommandCompletionState::kNotAllowedByPolicy:
stop_reason_ = "Setting of run on OS login mode not allowed by policy";
break;
@@ -116,7 +116,7 @@
stop_reason_ = "App is not locally installed";
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
GetMutableDebugValue().Set("Command Stop Reason: ", stop_reason_);
CompleteAndSelfDestruct(CommandResult::kFailure);
diff --git a/chrome/browser/web_applications/commands/web_app_uninstall_command.cc b/chrome/browser/web_applications/commands/web_app_uninstall_command.cc
index a1a7003f..15f9149 100644
--- a/chrome/browser/web_applications/commands/web_app_uninstall_command.cc
+++ b/chrome/browser/web_applications/commands/web_app_uninstall_command.cc
@@ -149,7 +149,7 @@
case webapps::UninstallResultCode::kError:
return CommandResult::kFailure;
case webapps::UninstallResultCode::kShutdown:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}(),
code);
diff --git a/chrome/browser/web_applications/isolated_web_apps/check_isolated_web_app_bundle_installability_command.cc b/chrome/browser/web_applications/isolated_web_apps/check_isolated_web_app_bundle_installability_command.cc
index 18c32aa..ca0b7fa 100644
--- a/chrome/browser/web_applications/isolated_web_apps/check_isolated_web_app_bundle_installability_command.cc
+++ b/chrome/browser/web_applications/isolated_web_apps/check_isolated_web_app_bundle_installability_command.cc
@@ -106,7 +106,7 @@
installed_version->GetString()});
break;
case IsolatedInstallabilityCheckResult::kShutdown:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
GetMutableDebugValue().Set("result", message);
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_csp_browsertest.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_csp_browsertest.cc
index 445eef96..d52a5c33 100644
--- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_csp_browsertest.cc
+++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_csp_browsertest.cc
@@ -332,7 +332,7 @@
case net::SpawnedTestServer::TYPE_WSS:
return "Wss";
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
});
diff --git a/chrome/browser/web_applications/isolated_web_apps/policy/isolated_web_app_policy_manager.cc b/chrome/browser/web_applications/isolated_web_apps/policy/isolated_web_app_policy_manager.cc
index eb790eaa..c8906f7 100644
--- a/chrome/browser/web_applications/isolated_web_apps/policy/isolated_web_app_policy_manager.cc
+++ b/chrome/browser/web_applications/isolated_web_apps/policy/isolated_web_app_policy_manager.cc
@@ -677,7 +677,7 @@
case WebAppManagement::kSync:
case WebAppManagement::kApsDefault:
case WebAppManagement::kDefault: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Do not touch installed apps if they are managed by a higher priority (=
diff --git a/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc b/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc
index b920b9a..0c685a47 100644
--- a/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc
+++ b/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc
@@ -1503,7 +1503,7 @@
case WebAppSpecifics_UserDisplayMode_STANDALONE:
return "standalone";
case WebAppSpecifics_UserDisplayMode_TABBED:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1517,7 +1517,7 @@
case UserDisplayMode::kStandalone:
return "standalone";
case UserDisplayMode::kTabbed:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
} // namespace
diff --git a/chrome/browser/webauthn/android/cable_module_android.cc b/chrome/browser/webauthn/android/cable_module_android.cc
index 2cd0fba..6f127fd 100644
--- a/chrome/browser/webauthn/android/cable_module_android.cc
+++ b/chrome/browser/webauthn/android/cable_module_android.cc
@@ -457,7 +457,7 @@
return result;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace internal
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
index 2a42734..07321ac 100644
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -947,7 +947,7 @@
mechanism_is_transport(mech,
AuthenticatorTransport::kInternal));
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
return false;
}
});
@@ -1058,7 +1058,7 @@
return;
case BleStatus::kPendingPermissionRequest:
// This should have been handled by EnsureBleAdapterIsPoweredAndContinue.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/webauthn/enclave_authenticator_browsertest.cc b/chrome/browser/webauthn/enclave_authenticator_browsertest.cc
index c2212d7..9b32c5d8 100644
--- a/chrome/browser/webauthn/enclave_authenticator_browsertest.cc
+++ b/chrome/browser/webauthn/enclave_authenticator_browsertest.cc
@@ -922,7 +922,7 @@
} else if (script_result == "\"IsUVPAA: false\"") {
return false;
}
- NOTREACHED_NORETURN() << "unexpected IsUVPAA result: " << script_result;
+ NOTREACHED() << "unexpected IsUVPAA result: " << script_result;
}
void SetBiometricsEnabled(bool enabled) {
@@ -3502,16 +3502,16 @@
std::unique_ptr<crypto::UnexportableSigningKey> GenerateSigningKeySlowly(
base::span<const crypto::SignatureVerifier::SignatureAlgorithm>
acceptable_algorithms) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::unique_ptr<crypto::UnexportableSigningKey> FromWrappedSigningKeySlowly(
base::span<const uint8_t> wrapped_key) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool DeleteSigningKeySlowly(base::span<const uint8_t> wrapped_key) override {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
};
diff --git a/chrome/browser/webauthn/enclave_manager_interface.cc b/chrome/browser/webauthn/enclave_manager_interface.cc
index 8c5b568..d439b64 100644
--- a/chrome/browser/webauthn/enclave_manager_interface.cc
+++ b/chrome/browser/webauthn/enclave_manager_interface.cc
@@ -7,5 +7,5 @@
#include "base/notreached.h"
EnclaveManager* EnclaveManagerInterface::GetEnclaveManager() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/chrome/browser/webauthn/enclave_manager_unittest.cc b/chrome/browser/webauthn/enclave_manager_unittest.cc
index 57900d32..169d89f 100644
--- a/chrome/browser/webauthn/enclave_manager_unittest.cc
+++ b/chrome/browser/webauthn/enclave_manager_unittest.cc
@@ -409,7 +409,7 @@
ui_request->entity = std::move(entity);
ui_request->claimed_pin = std::move(claimed_pin);
ui_request->save_passkey_callback = base::BindOnce(
- [](sync_pb::WebauthnCredentialSpecifics) { NOTREACHED_NORETURN(); });
+ [](sync_pb::WebauthnCredentialSpecifics) { NOTREACHED(); });
}
enclave::EnclaveAuthenticator authenticator(
@@ -1797,7 +1797,7 @@
ui_request->entity = GetTestEntity();
ui_request->claimed_pin = nullptr;
ui_request->save_passkey_callback = base::BindOnce(
- [](sync_pb::WebauthnCredentialSpecifics) { NOTREACHED_NORETURN(); });
+ [](sync_pb::WebauthnCredentialSpecifics) { NOTREACHED(); });
ui_request->user_verified = true;
ui_request->uv_key_creation_callback =
manager_.UserVerifyingKeyCreationCallback();
diff --git a/chrome/browser/webauthn/fake_security_domain_service.cc b/chrome/browser/webauthn/fake_security_domain_service.cc
index 63b0d93..2566060 100644
--- a/chrome/browser/webauthn/fake_security_domain_service.cc
+++ b/chrome/browser/webauthn/fake_security_domain_service.cc
@@ -108,7 +108,7 @@
return AddMember(request);
} else {
CHECK(false) << "Unhandled security domain service path: " << path;
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/chrome/browser/webauthn/gpm_enclave_controller.cc b/chrome/browser/webauthn/gpm_enclave_controller.cc
index be57c38..127a872a 100644
--- a/chrome/browser/webauthn/gpm_enclave_controller.cc
+++ b/chrome/browser/webauthn/gpm_enclave_controller.cc
@@ -1055,7 +1055,7 @@
break;
case EnclaveUserVerificationMethod::kUnsatisfiable:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
@@ -1243,7 +1243,7 @@
enclave_manager_->GetWeakPtr(), base::DoNothing());
break;
case EnclaveUserVerificationMethod::kUnsatisfiable:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
switch (request_type_) {
