0

Migrate NOTREACHED_NORETURN -> NOTREACHED

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

This does not attempt to do a rewrite of any surrounding code, like:

if (!foo) {
  NOTREACHED();
}

to CHECK(foo);

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

NO_IFTTT=No-op-rename migration.

Bug: 40580068
Change-Id: I068c5fdce9dc4c352d8bdd62bb3cd2c0a2d59659
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5782602
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1342096}
This commit is contained in:
Peter Boström
2024-08-15 02:39:49 +00:00
committed by Chromium LUCI CQ
parent cc7de17279
commit 01ab59ae08
1259 changed files with 2336 additions and 2407 deletions
android_webview
ash
accelerators
ambient
app_list
assistant
birch
capture_mode
clipboard
components
events
game_dashboard
glanceables
picker
public
quick_pair
rounded_display
scalable_iph
system
user_education
webui
wm
base/android
cc
chrome
browser
accessibility
ai
apps
app_service
publishers
link_capturing
platform_apps
ash
autofill
banners
bookmarks
browsing_data
chromeos
device_notifications
device_reauth
digital_credentials
download
enterprise
extensions
feedback
first_party_sets
hid
ip_protection
keyboard_accessory
lacros
mac
media
metrics
os_crypt
page_load_metrics
password_manager
performance_manager
policy
predictors
lcp_critical_path_predictor
preloading
printing
privacy_sandbox
profiles
promos
safe_browsing
safety_hub
screen_ai
sharesheet
shell_integration_linux.cc
signin
storage_access_api
supervised_user
sync
ui
ash
autofill
browser_navigator_iwa_browsertest.cc
content_settings
download
extensions
file_system_access
layout_constants.ccmanaged_ui.cc
passwords
serial
signin
tab_sharing
tabs
views
accelerator_table.cc
apps
autofill
bookmarks
browser_commands_views.cccertificate_selector.ccchrome_layout_provider.ccconstrained_web_dialog_delegate_views.cccontent_setting_bubble_contents.cccrypto_module_password_dialog_view.cc
desktop_capture
download
extensions
flying_indicator.cc
frame
global_media_controls
intent_picker_bubble_view.cc
location_bar
mahi
media_preview
media_router
message_box_dialog.cc
notifications
overlay
page_info
passwords
payments
performance_controls
permissions
platform_keys_certificate_selector_chromeos.cc
plugin_vm
privacy_sandbox
profiles
promos
renderer_context_menu
safe_browsing
select_file_dialog_extension.cc
send_tab_to_self
site_data
status_icons
supervised_user
tabs
toolbar
translate
user_education
web_apps
webauthn
web_applications
webauthn
webui
usb
user_education
vr
web_applications
webauthn
common
renderer
services
test
chromecast
chromeos
components
access_code_cast
android_autofill
app_launch_prefetch
attribution_reporting
autofill
bookmarks
browsing_data
browsing_topics
commerce
component_updater
content_settings
data_sharing
download
error_page
exo
global_media_controls
gwp_asan
client
lightweight_detector
heap_profiling
history
invalidation
ip_protection
metrics
omnibox
optimization_guide
os_crypt
ownership
page_load_metrics
password_manager
payments
pdf
performance_manager
permissions
plus_addresses
policy
power_metrics
prefs
printing
privacy_sandbox
qr_code_generator
reading_list
reporting
storage
safe_browsing
services
sharing_message
signin
speech
supervised_user
sync
sync_bookmarks
sync_device_info
sync_preferences
tpcd
trusted_vault
unexportable_keys
unified_consent
user_education
viz
web_package
webauthn
content
browser
accessibility
aggregation_service
attribution_reporting
buckets
devtools
fenced_frame
file_system_access
first_party_sets
generic_sensor
gpu
indexed_db
interest_group
loader
media
navigation_transitions
network
preloading
private_aggregation
renderer_host
service_worker
shared_storage
usb
webid
worker_host
common
public
renderer
shell
test
utility
web_test
device
extensions
fuchsia_web/webengine/renderer
gin
google_apis
gpu
ios
chrome
app
application_delegate
browser
autofill
bookmarks
credential_provider
default_browser
default_promo
home_customization
ntp
overlays
passwords
providers
segmentation_platform
sessions
settings
model
sync
shared
signin
supervised_user
tips_notifications
ui
authentication
content_suggestions
menu
popup_menu
reading_list
recent_tabs
settings
tab_switcher
unit_conversion
upgrade
web
common
open_extension
test
providers
web
media
audio
base
capture
cast
cdm
filters
formats
fuchsia
gpu
learning
midi
mojo
parsers
renderers
video
mojo
net
pdf
printing/backend
services
skia/public/mojom
sql
styleguide/c++
testing/rust_gtest_interop
third_party/blink
common
public
renderer
bindings
core
extensions
chromeos
webview
modules
platform
ui
accessibility
base
color
display
events
gfx
gl
native_theme
ozone
shell_dialogs
touch_selection
views
url

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -644,7 +644,7 @@ class EnrollmentErrorScreenTest
bool IsManualEnrollmentMode(policy::EnrollmentConfig::Mode mode) const { bool IsManualEnrollmentMode(policy::EnrollmentConfig::Mode mode) const {
switch (mode) { switch (mode) {
case policy::EnrollmentConfig::MODE_NONE: 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:
case policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT: case policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT:
case policy::EnrollmentConfig::MODE_LOCAL_ADVERTISED: case policy::EnrollmentConfig::MODE_LOCAL_ADVERTISED:

Some files were not shown because too many files have changed in this diff Show More