Use NOTREACHED_IN_MIGRATION() in the rest of src/

This was generated by replacing "  NOTREACHED()" with
"  NOTREACHED_IN_MIGRATION()" and running git cl format.

This prepares for making NOTREACHED() [[noreturn]] alongside
NotReachedIsFatal migration of existing inventory.

third_party/crashpad is still excluded, needs to be changed upstream.

Bug: 40580068
Change-Id: Ia5dbaddf53dba2fedefb67f1d428e8b24e9edffe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5545021
Commit-Queue: Peter Boström <pbos@chromium.org>
Auto-Submit: Peter Boström <pbos@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Owners-Override: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1302314}

android_webview/browser/aw_browser_context.cc

@@ -158,7 +158,8 @@ void MigrateProfileData(base::FilePath cache_path,
 base::FilePath BuildCachePath(const base::FilePath& relative_path) {
   FilePath cache_path;
   if (!base::PathService::Get(base::DIR_CACHE, &cache_path)) {
-    NOTREACHED() << "Failed to get app cache directory for Android WebView";
+    NOTREACHED_IN_MIGRATION()
+        << "Failed to get app cache directory for Android WebView";
   }
   return cache_path.Append(relative_path);
 }
@@ -686,7 +687,8 @@ base::FilePath AwBrowserContext::BuildStoragePath(
     const base::FilePath& relative_path) {
   base::FilePath user_data_dir;
   if (!base::PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
-    NOTREACHED() << "Failed to get app data directory for Android WebView";
+    NOTREACHED_IN_MIGRATION()
+        << "Failed to get app data directory for Android WebView";
   }
   return user_data_dir.Append(relative_path);
 }

android_webview/browser/aw_browser_main_parts.cc

@@ -324,7 +324,7 @@ int AwBrowserMainParts::PreMainMessageLoopRun() {
 
 void AwBrowserMainParts::WillRunMainMessageLoop(
     std::unique_ptr<base::RunLoop>& run_loop) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 void AwBrowserMainParts::PostCreateThreads() {

android_webview/browser/aw_browser_terminator.cc

@@ -112,7 +112,7 @@ void OnRenderProcessGone(
                      << " killing application.";
           kill(getpid(), SIGKILL);
         }
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
       case AwRenderProcessGoneDelegate::RenderProcessGoneResult::kHandled:
         // Don't log UMA yet. This WebView may be handled, but we need to wait

android_webview/browser/aw_content_browser_client.cc

@@ -518,7 +518,8 @@ base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() {
 }
 
 std::string AwContentBrowserClient::GetDefaultDownloadName() {
-  NOTREACHED() << "Android WebView does not use chromium downloads";
+  NOTREACHED_IN_MIGRATION()
+      << "Android WebView does not use chromium downloads";
   return std::string();
 }
 
@@ -535,7 +536,7 @@ AwContentBrowserClient::GetLocalTracesDirectory() {
 
 void AwContentBrowserClient::DidCreatePpapiPlugin(
     content::BrowserPpapiHost* browser_host) {
-  NOTREACHED() << "Android WebView does not support plugins";
+  NOTREACHED_IN_MIGRATION() << "Android WebView does not support plugins";
 }
 
 bool AwContentBrowserClient::AllowPepperSocketAPI(
@@ -543,14 +544,14 @@ bool AwContentBrowserClient::AllowPepperSocketAPI(
     const GURL& url,
     bool private_api,
     const content::SocketPermissionRequest* params) {
-  NOTREACHED() << "Android WebView does not support plugins";
+  NOTREACHED_IN_MIGRATION() << "Android WebView does not support plugins";
   return false;
 }
 
 bool AwContentBrowserClient::IsPepperVpnProviderAPIAllowed(
     content::BrowserContext* browser_context,
     const GURL& url) {
-  NOTREACHED() << "Android WebView does not support plugins";
+  NOTREACHED_IN_MIGRATION() << "Android WebView does not support plugins";
   return false;
 }
 

android_webview/browser/aw_contents.cc

@@ -1295,7 +1295,7 @@ jint AwContents::GetEffectivePriority(JNIEnv* env) {
     case content::ChildProcessImportance::IMPORTANT:
       return static_cast<jint>(RendererPriority::HIGH);
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return 0;
 }
 

android_webview/browser/aw_contents_client_bridge.cc

@@ -306,7 +306,7 @@ void AwContentsClientBridge::RunJavaScriptDialog(
       break;
     }
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 }
 

android_webview/browser/aw_field_trials.cc

@@ -66,7 +66,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
   if (base::PathService::Get(base::DIR_ANDROID_APP_DATA, &metrics_dir)) {
     InstantiatePersistentHistogramsWithFeaturesAndCleanup(metrics_dir);
   } else {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 

android_webview/browser/aw_permission_manager.cc

@@ -53,11 +53,11 @@ class LastRequestResultCache {
     }
 
     if (!requesting_origin.is_valid()) {
-      NOTREACHED() << requesting_origin.possibly_invalid_spec();
+      NOTREACHED_IN_MIGRATION() << requesting_origin.possibly_invalid_spec();
       return;
     }
     if (!embedding_origin.is_valid()) {
-      NOTREACHED() << embedding_origin.possibly_invalid_spec();
+      NOTREACHED_IN_MIGRATION() << embedding_origin.possibly_invalid_spec();
       return;
     }
 
@@ -68,7 +68,7 @@ class LastRequestResultCache {
 
     std::string key = GetCacheKey(requesting_origin, embedding_origin);
     if (key.empty()) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       // Never store an empty key because it could inadvertently be used for
       // another combination.
       return;
@@ -90,7 +90,8 @@ class LastRequestResultCache {
         << embedding_origin.possibly_invalid_spec();
 
     if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
-      NOTREACHED() << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
+      NOTREACHED_IN_MIGRATION()
+          << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
       return PermissionStatus::ASK;
     }
 
@@ -169,7 +170,7 @@ class AwPermissionManager::PendingRequest {
   void SetPermissionStatus(PermissionType type, PermissionStatus status) {
     auto result = permission_index_map_.find(type);
     if (result == permission_index_map_.end()) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return;
     }
     DCHECK(!IsCompleted());
@@ -191,7 +192,7 @@ class AwPermissionManager::PendingRequest {
   PermissionStatus GetPermissionStatus(PermissionType type) {
     auto result = permission_index_map_.find(type);
     if (result == permission_index_map_.end()) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return PermissionStatus::DENIED;
     }
     return results[result->second];
@@ -369,7 +370,8 @@ void AwPermissionManager::RequestPermissions(
                                                  PermissionStatus::DENIED);
         break;
       case PermissionType::NUM:
-        NOTREACHED() << "PermissionType::NUM was not expected here.";
+        NOTREACHED_IN_MIGRATION()
+            << "PermissionType::NUM was not expected here.";
         pending_request_raw->SetPermissionStatus(permissions[i],
                                                  PermissionStatus::DENIED);
         break;
@@ -612,7 +614,8 @@ void AwPermissionManager::CancelPermissionRequest(int request_id) {
         // There is nothing to cancel so this is simply ignored.
         break;
       case PermissionType::NUM:
-        NOTREACHED() << "PermissionType::NUM was not expected here.";
+        NOTREACHED_IN_MIGRATION()
+            << "PermissionType::NUM was not expected here.";
         break;
     }
     pending_request->SetPermissionStatus(permission, PermissionStatus::DENIED);

android_webview/browser/aw_permission_manager_unittest.cc

@@ -96,7 +96,7 @@ class AwBrowserPermissionRequestDelegateForTesting final
       request_.erase(it);
       return;
     }
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
  private:

android_webview/browser/aw_print_manager.cc

@@ -136,7 +136,7 @@ void AwPrintManager::DidPrintDocument(
 
   const printing::mojom::DidPrintContentParams& content = *params->content;
   if (!content.metafile_data_region.IsValid()) {
-    NOTREACHED() << "invalid memory handle";
+    NOTREACHED_IN_MIGRATION() << "invalid memory handle";
     web_contents()->Stop();
     PdfWritingDone(0);
     std::move(callback).Run(false);
@@ -146,7 +146,7 @@ void AwPrintManager::DidPrintDocument(
   auto data = base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(
       content.metafile_data_region);
   if (!data) {
-    NOTREACHED() << "couldn't map";
+    NOTREACHED_IN_MIGRATION() << "couldn't map";
     web_contents()->Stop();
     PdfWritingDone(0);
     std::move(callback).Run(false);

android_webview/browser/aw_quota_manager_bridge.cc

@@ -138,7 +138,7 @@ void GetStorageKeysTask::CheckDone() {
     content::GetUIThreadTaskRunner({})->PostTask(
         FROM_HERE, base::BindOnce(&GetStorageKeysTask::DoneOnUIThread, this));
   } else if (num_callbacks_received_ > num_callbacks_to_wait_) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 

android_webview/browser/aw_web_contents_view_delegate.cc

@@ -22,7 +22,7 @@ AwWebContentsViewDelegate::~AwWebContentsViewDelegate() {}
 content::WebDragDestDelegate* AwWebContentsViewDelegate::GetDragDestDelegate() {
   // GetDragDestDelegate is a pure virtual method from WebContentsViewDelegate
   // and must have an implementation although android doesn't use it.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return NULL;
 }
 

android_webview/browser/cookie_manager.cc

@@ -190,7 +190,8 @@ namespace {
 base::FilePath GetPathInAppDirectory(std::string path) {
   base::FilePath result;
   if (!base::PathService::Get(base::DIR_ANDROID_APP_DATA, &result)) {
-    NOTREACHED() << "Failed to get app data directory for Android WebView";
+    NOTREACHED_IN_MIGRATION()
+        << "Failed to get app data directory for Android WebView";
   }
   result = result.Append(FILE_PATH_LITERAL(path));
   return result;

android_webview/browser/find_helper.cc

@@ -117,12 +117,12 @@ void FindHelper::NotifyResults(int active_ordinal,
 
   // Safeguard in case of errors to prevent reporting -1 to the API listeners.
   if (match_count == -1) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     match_count = 0;
   }
 
   if (active_ordinal == -1) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     active_ordinal = 0;
   }
 

android_webview/browser/gfx/aw_draw_fn_impl.cc

@@ -127,7 +127,7 @@ OverlaysParams::Mode GetOverlaysMode(AwDrawFnOverlaysMode mode) {
     case AW_DRAW_FN_OVERLAYS_MODE_ENABLED:
       return OverlaysParams::Mode::Enabled;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return OverlaysParams::Mode::Disabled;
   }
 }

android_webview/browser/gfx/display_scheduler_webview.cc

@@ -31,10 +31,10 @@ DisplaySchedulerWebView::~DisplaySchedulerWebView() {
 
 void DisplaySchedulerWebView::ForceImmediateSwapIfPossible() {
   // We can't swap immediately
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 void DisplaySchedulerWebView::SetNeedsOneBeginFrame(bool needs_draw) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 void DisplaySchedulerWebView::DidSwapBuffers() {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);

android_webview/browser/gfx/skia_output_surface_dependency_webview.cc

@@ -117,13 +117,13 @@ SkiaOutputSurfaceDependencyWebView::CreateGLSurface(
 
 base::ScopedClosureRunner SkiaOutputSurfaceDependencyWebView::CachePresenter(
     gl::Presenter* presenter) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return base::ScopedClosureRunner();
 }
 
 base::ScopedClosureRunner SkiaOutputSurfaceDependencyWebView::CacheGLSurface(
     gl::GLSurface* surface) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return base::ScopedClosureRunner();
 }
 

android_webview/browser/gfx/task_forwarding_sequence.cc

@@ -68,7 +68,7 @@ void TaskForwardingSequence::ScheduleOrRetainTask(
 // Should not be called because tasks aren't reposted to wait for sync tokens,
 // or for yielding execution since ShouldYield() returns false.
 void TaskForwardingSequence::ContinueTask(base::OnceClosure task) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 // Method to wrap scheduled task with the order number processing required for

android_webview/browser/icon_helper.cc

@@ -109,7 +109,7 @@ void IconHelper::DidUpdateFaviconURL(
         // Silently ignore it. Only trigger a callback on valid icons.
         break;
       default:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
     }
   }

android_webview/browser/metrics/visibility_metrics_logger.cc

@@ -48,7 +48,7 @@ const char* SchemeEnumToString(VisibilityMetricsLogger::Scheme scheme) {
     case VisibilityMetricsLogger::Scheme::kIntent:
       return "intent";
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
   return "";
 }

android_webview/browser/network_service/aw_proxy_config_monitor.cc

@@ -119,7 +119,7 @@ void AwProxyConfigMonitor::OnProxyConfigChanged(
             net::ProxyConfigWithAnnotation::CreateDirect());
         break;
       case net::ProxyConfigService::CONFIG_PENDING:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
     }
   }

android_webview/browser/network_service/aw_proxying_url_loader_factory.cc

@@ -552,7 +552,7 @@ void InterceptedRequest::InterceptResponseReceived(
         committed_mode = CommittedRequestedWithHeaderMode::kConstantWebview;
         break;
       default:
-        NOTREACHED()
+        NOTREACHED_IN_MIGRATION()
             << "Invalid enum value for AwSettings:RequestedWithHeaderMode: "
             << requested_with_header_mode;
     }

android_webview/browser/renderer_host/auto_login_parser.cc

@@ -22,7 +22,7 @@ bool MatchRealm(const std::string& realm, RealmRestriction restriction) {
     case ALLOW_ANY_REALM:
       return true;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return false;
   }
 }

android_webview/browser/safe_browsing/aw_url_checker_delegate_impl.cc

@@ -96,7 +96,7 @@ void AwUrlCheckerDelegateImpl::
     StartObservingInteractionsForDelayedBlockingPageHelper(
         const security_interstitials::UnsafeResource& resource,
         bool is_main_frame) {
-  NOTREACHED() << "Delayed warnings not implemented for WebView";
+  NOTREACHED_IN_MIGRATION() << "Delayed warnings not implemented for WebView";
 }
 
 bool AwUrlCheckerDelegateImpl::IsUrlAllowlisted(const GURL& url) {
@@ -274,7 +274,7 @@ void AwUrlCheckerDelegateImpl::DoApplicationResponse(
       proceed = false;
       break;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 
   if (!proceed) {

android_webview/common/crash_reporter/aw_crash_reporter_client.cc

@@ -115,7 +115,7 @@ bool g_enabled;
 
 void EnableCrashReporter(const std::string& process_type) {
   if (g_enabled) {
-    NOTREACHED() << "EnableCrashReporter called more than once";
+    NOTREACHED_IN_MIGRATION() << "EnableCrashReporter called more than once";
     return;
   }
 

android_webview/lib/webview_entry_point.cc

@@ -25,7 +25,7 @@ bool NativeInit(base::android::LibraryProcessType library_process_type) {
       LOG(FATAL) << "WebView cannot be started with a browser process type.";
 
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return false;
   }
 }

android_webview/nonembedded/component_updater/aw_component_installer_policy.cc

@@ -41,7 +41,7 @@ AwComponentInstallerPolicy::AwComponentInstallerPolicy() = default;
 
 void AwComponentInstallerPolicy::OnCustomUninstall() {
   // Uninstallation isn't supported in WebView.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 // Copy the components file from `install_dir` to the serving directory of the

android_webview/test/shell/src/draw_fn/allocator.cc

@@ -21,7 +21,7 @@ AwDrawFnRenderMode QueryRenderMode() {
 }
 
 int CreateFunctor(void* data, AwDrawFnFunctorCallbacks* functor_callbacks) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return 0;
 }
 

apps/launcher.cc

@@ -398,7 +398,7 @@ void LaunchPlatformAppWithCommandLineAndLaunchId(
     if (!in_kiosk_mode) {
       LOG(ERROR) << "App with 'kiosk_only' attribute must be run in "
                  << " ChromeOS kiosk mode.";
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return;
     }
   }

chrome/browser/ash/policy/core/device_policy_decoder.cc

@@ -111,7 +111,7 @@ std::optional<PolicyLevel> GetPolicyLevel(
     case em::PolicyOptions::UNSET:
       return std::nullopt;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return std::nullopt;
 }
 

chromeos/ash/components/wifi_p2p/wifi_p2p_metrics_logger.cc

@@ -57,7 +57,7 @@ void WifiP2PMetricsLogger::RecordWifiP2POperationResult(
       base::UmaHistogramEnumeration(kDisconnectP2PGroupHistogram, result);
       return;
   }
-  NOTREACHED() << "Unknown WiFi P2P operation type: " << type;
+  NOTREACHED_IN_MIGRATION() << "Unknown WiFi P2P operation type: " << type;
 }
 
 // static

codelabs/mojo_examples/01-multi-process/renderer.cc

@@ -27,7 +27,7 @@ class ProcessImpl : public codelabs::mojom::Process {
       const std::string&,
       mojo::PendingAssociatedReceiver<codelabs::mojom::GenericInterface>)
       override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
   void SayHello() override { LOG(INFO) << "Hello!"; }
 

courgette/adjustment_method.cc

@@ -633,7 +633,7 @@ class GraphAdjuster : public AdjustmentMethod {
       prev = curr;
 
       if (curr->positions_.size() != curr->refs_)
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
     }
   }
 

courgette/adjustment_method_2.cc

@@ -464,7 +464,7 @@ bool Shingle::InterningLess::operator()(
     if (info_a->is_model_ > info_b->is_model_)
       return false;
     if (info_a != info_b) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
     }
   }
   return false;
@@ -1000,7 +1000,7 @@ class AssignmentProblem {
       LOG_ASSERT(n == 1);
     } else if (pattern->program_histogram_.empty() &&
                pattern->model_histogram_.empty()) {
-      NOTREACHED();  // Should not come back to life.
+      NOTREACHED_IN_MIGRATION();  // Should not come back to life.
     } else if (pattern->program_histogram_.empty()) {
       // Useless pattern.
     } else {

courgette/courgette_flow.cc

@@ -42,7 +42,7 @@ const char* CourgetteFlow::name(Group group) {
     case NEW:
       return "'new' input";
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
   }
   return nullptr;
@@ -57,7 +57,7 @@ CourgetteFlow::Data* CourgetteFlow::data(Group group) {
     case NEW:
       return &data_new_;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
   }
   return nullptr;

courgette/disassembler_win32.cc

@@ -31,7 +31,7 @@ RVA DisassemblerWin32::FileOffsetToRVA(FileOffset file_offset) const {
     }
   }
 
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return kNoRVA;
 }
 
@@ -55,7 +55,7 @@ FileOffset DisassemblerWin32::RVAToFileOffset(RVA rva) const {
   if (rva == 0 || rva == 2)
     return static_cast<FileOffset>(rva);
 
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return kNoFileOffset;
 }
 
@@ -161,7 +161,7 @@ bool DisassemblerWin32::ParseHeader() {
       break;
 
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 
   if (size_of_image_ >= 0x80000000U)

courgette/label_manager_unittest.cc

@@ -68,7 +68,7 @@ LabelVector CreateLabelVectorWithIndexes(const std::string& encoded_index) {
     if (ch != '.') {
       // Sanity check for test case.
       if (ch < 'A' || ch > 'Z' || used_ch.find(ch) != used_ch.end())
-        NOTREACHED() << "Malformed test case: " << encoded_index;
+        NOTREACHED_IN_MIGRATION() << "Malformed test case: " << encoded_index;
       used_ch.insert(ch);
       index = ch - 'A';
     }
@@ -89,7 +89,7 @@ std::string EncodeLabelIndexes(const LabelVector& labels) {
     else if (label.index_ >= 0 && label.index_ <= 'Z' - 'A')
       encoded += static_cast<char>(label.index_ + 'A');
     else
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
   return encoded;
 }

courgette/rel32_finder_unittest.cc

@@ -51,7 +51,7 @@ class Rel32FinderTestCase {
       finder_ = std::unique_ptr<Rel32Finder>(
           new Rel32FinderX86(relocs_start_rva_, relocs_end_rva_));
     } else {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
     }
   }
 

crypto/hmac.cc

@@ -38,7 +38,7 @@ size_t HMAC::DigestLength() const {
     case SHA256:
       return 32;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return 0;
   }
 }

crypto/symmetric_key.cc

@@ -31,7 +31,7 @@ bool CheckDerivationParameters(SymmetricKey::Algorithm algorithm,
       return key_size_in_bits % 8 == 0 && key_size_in_bits != 0;
   }
 
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return false;
 }
 

crypto/unexportable_key_software_unsecure.cc

@@ -67,7 +67,7 @@ class SoftwareECDSA : public UnexportableSigningKey {
 
 #if BUILDFLAG(IS_MAC)
   SecKeyRef GetSecKeyRef() const override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return nullptr;
   }
 #endif  // BUILDFLAG(IS_MAC)

dbus/dbus_statistics.cc

@@ -80,7 +80,7 @@ class DBusStatistics {
     else if (type == TYPE_SENT_BLOCKING_METHOD_CALLS)
       ++stat->sent_blocking_method_calls;
     else
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 
   // Look up the Stat entry in |stats_|. If |add_stat| is true, add a new entry

dbus/message.cc

@@ -80,7 +80,7 @@ std::string Message::GetMessageTypeAsString() {
     case MESSAGE_ERROR:
       return "MESSAGE_ERROR";
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return std::string();
 }
 

dbus/values_util.cc

@@ -174,7 +174,7 @@ base::Value PopDataAsValue(MessageReader* reader) {
     }
     case Message::UNIX_FD: {
       // Cannot distinguish a file descriptor from an int
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
     }
     case Message::ARRAY: {
@@ -206,7 +206,7 @@ base::Value PopDataAsValue(MessageReader* reader) {
     }
     case Message::DICT_ENTRY:
       // DICT_ENTRY must be popped as an element of an array.
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
     case Message::VARIANT: {
       MessageReader sub_reader(nullptr);

docs/security/mojo.md

@@ -277,7 +277,7 @@ class View : public mojom::View {
 #else
   void UpdateBrowserControlsState(bool enable_hiding, bool enable_showing,
                                   bool animate) override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 #endif
 };

extensions/browser/api/storage/storage_api.cc

@@ -222,14 +222,14 @@ ExtensionFunction::ResponseValue SettingsFunction::RunWithStorage(
     ValueStore* storage) {
   // TODO(crbug.com/40963428): Remove this when RunWithStorage has been removed
   // from all functions.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return BadMessage();
 }
 
 ExtensionFunction::ResponseValue SettingsFunction::RunInSession() {
   // TODO(crbug.com/40963428): Remove this when RunWithStorage has been removed
   // from all functions.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return BadMessage();
 }
 

fuchsia_web/runners/cast/application_controller_impl_unittest.cc

@@ -72,7 +72,7 @@ class ApplicationControllerImplTest
 
   // chromium_cast::ApplicationContext implementation.
   void GetMediaSessionId(GetMediaSessionIdCompleter::Sync& completer) override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     completer.Reply({});
   }
   void SetApplicationController(

fuchsia_web/webengine/browser/event_filter.cc

@@ -131,11 +131,11 @@ bool EventFilter::IsEventAllowed(ui::EventType type) {
       return true;
 
     case ui::ET_UMA_DATA:
-      NOTREACHED();  // ChromeOS only.
+      NOTREACHED_IN_MIGRATION();  // ChromeOS only.
       break;
 
     case ui::ET_LAST:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       [[fallthrough]];
 
     case ui::ET_UNKNOWN:

fuchsia_web/webengine/browser/frame_impl.cc

@@ -1532,7 +1532,7 @@ bool FrameImpl::CheckMediaAccessPermission(
       permission = blink::PermissionType::VIDEO_CAPTURE;
       break;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return false;
   }
 

fuchsia_web/webengine/browser/input_browsertest.cc

@@ -117,7 +117,8 @@ base::Value::List FuchsiaModifiersToWebModifiers(
     } else if (modifier == fuchsia_ui_input3::Modifiers::kShift) {
       web_modifiers.Append("Shift");
     } else {
-      NOTREACHED() << static_cast<uint64_t>(modifier) << " has no web mapping";
+      NOTREACHED_IN_MIGRATION()
+          << static_cast<uint64_t>(modifier) << " has no web mapping";
     }
   }
   return web_modifiers;

fuchsia_web/webengine/browser/navigation_policy_throttle.cc

@@ -74,7 +74,7 @@ void NavigationPolicyThrottle::OnRequestedNavigationEvaluated(
       // NavigationHandle that owns this NavigationThrottle.
       break;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 }
 

fuchsia_web/webengine/browser/theme_manager.cc

@@ -27,7 +27,7 @@ PreferredColorScheme ThemeTypeToBlinkScheme(ThemeType type) {
     case ThemeType::DARK:
       return PreferredColorScheme::kDark;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return kFallbackColorScheme;
   }
 }

fuchsia_web/webengine/browser/theme_manager_browsertest.cc

@@ -104,7 +104,7 @@ class ThemeManagerTest : public WebEngineBrowserTest,
         return scheme;
     }
 
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return "";
   }
 

fuchsia_web/webengine/renderer/web_engine_audio_device_factory.cc

@@ -41,7 +41,7 @@ WebEngineAudioDeviceFactory::NewAudioRendererSink(
   switch (source_type) {
     case blink::WebAudioDeviceSourceType::kMediaElement:
       // MediaElement uses NewMixableSink().
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return nullptr;
 
     case blink::WebAudioDeviceSourceType::kWebRtc:

fuchsia_web/webengine/renderer/web_engine_audio_renderer.cc

@@ -412,7 +412,7 @@ void WebEngineAudioRenderer::StopTicking() {
   switch (GetPlaybackState()) {
     case PlaybackState::kStopped:
     case PlaybackState::kPaused:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
 
     case PlaybackState::kStartPending: {

fuchsia_web/webengine/renderer/web_engine_audio_renderer_test.cc

@@ -74,7 +74,7 @@ class TestDemuxerStream : public media::DemuxerStream {
   }
   media::AudioDecoderConfig audio_decoder_config() override { return config_; }
   media::VideoDecoderConfig video_decoder_config() override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return media::VideoDecoderConfig();
   }
   Type type() const override { return AUDIO; }

fuchsia_web/webengine/renderer/web_engine_render_frame_observer.cc

@@ -27,7 +27,7 @@ WebEngineRenderFrameObserver::~WebEngineRenderFrameObserver() = default;
 void WebEngineRenderFrameObserver::OnDestruct() {
   // We should never hit this since we will have destroyed this observer
   // in WillDetach.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 void WebEngineRenderFrameObserver::WillDetach(

gin/converter.h

@@ -226,7 +226,8 @@ struct Converter<std::vector<T> > {
       if (!result->CreateDataProperty(context, i, element)
                .To(&property_created) ||
           !property_created) {
-        NOTREACHED() << "CreateDataProperty should always succeed here.";
+        NOTREACHED_IN_MIGRATION()
+            << "CreateDataProperty should always succeed here.";
       }
     }
     return result;
@@ -276,7 +277,8 @@ struct Converter<v8::LocalVector<T>> {
       if (!result->CreateDataProperty(context, i, element)
                .To(&property_created) ||
           !property_created) {
-        NOTREACHED() << "CreateDataProperty should always succeed here.";
+        NOTREACHED_IN_MIGRATION()
+            << "CreateDataProperty should always succeed here.";
       }
     }
     return result;

gin/per_isolate_data.cc

@@ -108,7 +108,7 @@ void PerIsolateData::ClearIndexedPropertyInterceptor(
   if (it != indexed_interceptors_.end())
     indexed_interceptors_.erase(it);
   else
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
 }
 
 void PerIsolateData::ClearNamedPropertyInterceptor(
@@ -118,7 +118,7 @@ void PerIsolateData::ClearNamedPropertyInterceptor(
   if (it != named_interceptors_.end())
     named_interceptors_.erase(it);
   else
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
 }
 
 IndexedPropertyInterceptor* PerIsolateData::GetIndexedPropertyInterceptor(

gin/v8_initializer.cc

@@ -117,11 +117,11 @@ const char* GetSnapshotFileName(const V8SnapshotFileType file_type) {
 #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT)
       return kV8ContextSnapshotFileName;
 #else
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return nullptr;
 #endif
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return nullptr;
 }
 

gin/v8_platform.cc

@@ -241,7 +241,7 @@ std::shared_ptr<v8::TaskRunner> V8Platform::GetForegroundTaskRunner(
       // blink::scheduler::TaskPriority::kLowPriority
       return data->low_priority_task_runner();
     default:
-      NOTREACHED() << "Unsupported TaskPriority.";
+      NOTREACHED_IN_MIGRATION() << "Unsupported TaskPriority.";
       return data->task_runner();
   }
 }

google_apis/common/base_requests.cc

@@ -406,7 +406,7 @@ void UrlFetchRequestBase::OnOutputFileClosed(bool success) {
 }
 
 void UrlFetchRequestBase::OnRetry(base::OnceClosure start_retry) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 HttpRequestMethod UrlFetchRequestBase::GetRequestType() const {

google_apis/drive/drive_api_url_generator.cc

@@ -64,7 +64,7 @@ const char* GetCorporaString(FilesListCorpora corpora) {
     case FilesListCorpora::ALL_TEAM_DRIVES:
       return kCorporaAllTeamDrives;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return kCorporaDefault;
 }
 

google_apis/gaia/gaia_auth_fetcher.cc

@@ -752,7 +752,7 @@ void GaiaAuthFetcher::OnOAuth2RevokeTokenFetched(const std::string& data,
           GetTokenRevocationStatusFromResponseData(data, response_code);
       break;
     case net::ERR_IO_PENDING:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
     case net::ERR_ABORTED:
       revocation_status =
@@ -888,6 +888,6 @@ void GaiaAuthFetcher::DispatchFetchedRequest(const GURL& url,
   } else if (IsReAuthApiUrl(url)) {
     OnReAuthApiInfoFetched(data, net_error, response_code);
   } else {
-    NOTREACHED() << "Unknown url: '" << url << "'";
+    NOTREACHED_IN_MIGRATION() << "Unknown url: '" << url << "'";
   }
 }

google_apis/gaia/gaia_oauth_client.cc

@@ -614,7 +614,7 @@ void GaiaOAuthClient::Core::HandleResponse(std::unique_ptr<std::string> body,
     }
 
     case NO_PENDING_REQUEST:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 }
 

google_apis/gaia/google_service_auth_error.cc

@@ -28,7 +28,7 @@ const char* InvalidCredentialsReasonToString(
     case InvalidGaiaCredentialsReason::CREDENTIALS_MISSING:
       return "credentials missing";
     case InvalidGaiaCredentialsReason::NUM_REASONS:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return "";
   }
 }
@@ -194,7 +194,7 @@ std::string GoogleServiceAuthError::ToString() const {
     case CHALLENGE_RESPONSE_REQUIRED:
       return "Service responded with a token binding challenge.";
     case NUM_STATES:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return std::string();
   }
 }

google_apis/gaia/oauth2_access_token_fetcher_impl.cc

@@ -249,7 +249,7 @@ void OAuth2AccessTokenFetcherImpl::EndGetAccessToken(
   switch (response) {
     case kOk:
     case kOkUnexpectedFormat:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
 
     case kRateLimitExceeded:
@@ -289,7 +289,7 @@ void OAuth2AccessTokenFetcherImpl::EndGetAccessToken(
   if (!error.has_value()) {
     // Fallback to http status code.
     if (response_code == net::HTTP_OK) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
     } else if (response_code == net::HTTP_FORBIDDEN ||
                response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED ||
                response_code >= net::HTTP_INTERNAL_SERVER_ERROR) {

google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc

@@ -384,7 +384,7 @@ class OAuth2ErrorCodesTest
       case GoogleServiceAuthError::REQUEST_CANCELED:
       case GoogleServiceAuthError::CHALLENGE_RESPONSE_REQUIRED:
       case GoogleServiceAuthError::NUM_STATES:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         return GoogleServiceAuthError::AuthErrorNone();
     }
   }

google_apis/gaia/oauth_request_signer.cc

@@ -57,7 +57,7 @@ const std::string HttpMethodName(OAuthRequestSigner::HttpMethod method) {
     case OAuthRequestSigner::POST_METHOD:
       return "POST";
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return std::string();
 }
 
@@ -71,7 +71,7 @@ const std::string SignatureMethodName(
     case OAuthRequestSigner::PLAINTEXT_SIGNATURE:
       return "PLAINTEXT";
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return std::string();
 }
 
@@ -190,7 +190,7 @@ bool ParseQuery(const std::string& query,
       parameters[keyword] = value;
       break;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
   *parameters_result = parameters;
   return true;
@@ -283,7 +283,7 @@ bool SignParameters(const GURL& request_base_url,
       is_signed = SignPlaintext(base, key, &signature);
       break;
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
   if (is_signed)
     (*parameters)[kOAuthSignatureLabel] = signature;
@@ -413,7 +413,7 @@ bool OAuthRequestSigner::SignURL(
         signed_text += BuildBaseStringParameters(parameters);
         break;
       default:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
     }
     *signed_text_return = signed_text;
   }

google_apis/gcm/base/mcs_util.cc

@@ -189,7 +189,7 @@ void SetPersistentId(const std::string& persistent_id,
         set_persistent_id(persistent_id);
     return;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 uint32_t GetLastStreamIdReceived(
@@ -237,7 +237,7 @@ void SetLastStreamIdReceived(uint32_t val,
         set_last_stream_id_received(val);
     return;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 bool HasTTLExpired(const google::protobuf::MessageLite& protobuf,

google_apis/gcm/base/socket_stream.cc

@@ -48,7 +48,7 @@ SocketInputStream::~SocketInputStream() {
 
 bool SocketInputStream::Next(const void** data, int* size) {
   if (GetState() != EMPTY && GetState() != READY) {
-    NOTREACHED() << "Invalid input stream read attempt.";
+    NOTREACHED_IN_MIGRATION() << "Invalid input stream read attempt.";
     return false;
   }
 

google_apis/gcm/engine/account_mapping.cc

@@ -39,7 +39,7 @@ std::string StatusToString(AccountMapping::MappingStatus status) {
     case AccountMapping::REMOVING:
       return kStatusRemoving;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return std::string();
 }
 

google_apis/gcm/engine/checkin_request.cc

@@ -72,7 +72,7 @@ std::string GetCheckinRequestStatusString(CheckinRequestStatus status) {
       return "Failed: No headers";
   }
 
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return "Failed: Unknown reason";
 }
 

google_apis/gcm/engine/mcs_client.cc

@@ -154,7 +154,7 @@ std::string MCSClient::GetStateString() const {
     case CONNECTED:
       return "CONNECTED";
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return std::string();
 }
 

google_apis/gcm/engine/unregistration_request.cc

@@ -78,7 +78,7 @@ bool ShouldRetryWithStatus(UnregistrationRequest::Status status) {
     case UnregistrationRequest::REACHED_MAX_RETRIES:
       return false;
     case UnregistrationRequest::UNREGISTRATION_STATUS_COUNT:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       break;
   }
   return false;

headless/app/headless_shell.cc

@@ -254,7 +254,7 @@ int HeadlessShellMain(content::ContentMainParams params) {
 
   if (!process_type.empty()) {
     HeadlessChildMain(std::move(params));
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
 #if BUILDFLAG(IS_MAC)

headless/lib/browser/headless_request_context_manager.cc

@@ -156,7 +156,7 @@ class HeadlessProxyConfigMonitor
             net::ProxyConfigWithAnnotation::CreateDirect());
         break;
       case net::ProxyConfigService::CONFIG_PENDING:
-        NOTREACHED();
+        NOTREACHED_IN_MIGRATION();
         break;
     }
   }

ipc/handle_win.cc

@@ -24,7 +24,7 @@ void ParamTraits<HandleWin>::Write(base::Pickle* m, const param_type& p) {
   scoped_refptr<IPC::internal::HandleAttachmentWin> attachment(
       new IPC::internal::HandleAttachmentWin(p.get_handle()));
   if (!m->WriteAttachment(std::move(attachment)))
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
 }
 
 // static

ipc/ipc_channel_mojo.cc

@@ -92,7 +92,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafeProxy {
       mojo::Message& message,
       std::unique_ptr<mojo::MessageReceiver> responder) override {
     // We don't bother supporting this because it's not used in practice.
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
  private:

ipc/ipc_channel_mojo_unittest.cc

@@ -1174,7 +1174,7 @@ class SimpleTestClientImpl : public IPC::mojom::SimpleTestClient,
   void BindSync(
       mojo::PendingAssociatedReceiver<IPC::mojom::SimpleTestClient> receiver,
       BindSyncCallback callback) override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
   void GetReceiverWithQueuedSyncMessage(
@@ -1813,7 +1813,7 @@ class ListenerThatVerifiesPeerPid : public TestListenerBase {
   }
 
   bool OnMessageReceived(const IPC::Message& message) override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return true;
   }
 };

ipc/ipc_channel_nacl.cc

@@ -382,7 +382,7 @@ bool ChannelNacl::DidEmptyInputBuffers() {
 void ChannelNacl::HandleInternalMessage(const Message& msg) {
   // The trusted side IPC::Channel should handle the "hello" handshake; we
   // should not receive the "Hello" message.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
 }
 
 // Channel's methods

ipc/ipc_channel_proxy.cc

@@ -291,7 +291,7 @@ void ChannelProxy::Context::OnRemoveFilter(MessageFilter* filter) {
     }
   }
 
-  NOTREACHED() << "filter to be removed not found";
+  NOTREACHED_IN_MIGRATION() << "filter to be removed not found";
 }
 
 // Called on the listener's thread

ipc/ipc_message_attachment.cc

@@ -103,7 +103,7 @@ mojo::ScopedHandle MessageAttachment::TakeMojoHandle() {
     default:
       break;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return mojo::ScopedHandle();
 }
 
@@ -155,7 +155,7 @@ scoped_refptr<MessageAttachment> MessageAttachment::CreateFromMojoHandle(
         platform_file, internal::HandleAttachmentWin::FROM_WIRE);
   }
 #endif
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return nullptr;
 }
 

ipc/ipc_message_pipe_reader.cc

@@ -48,7 +48,7 @@ class ThreadSafeProxy : public mojo::ThreadSafeProxy {
       mojo::Message& message,
       std::unique_ptr<mojo::MessageReceiver> responder) override {
     // We don't bother supporting this because it's not used in practice.
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
  private:

ipc/ipc_message_templates.h

@@ -189,7 +189,8 @@ class MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>
     bool ok = ReadSendParam(msg, &send_params);
     Message* reply = SyncMessage::GenerateReply(msg);
     if (!ok) {
-      NOTREACHED() << "Error deserializing message " << msg->type();
+      NOTREACHED_IN_MIGRATION()
+          << "Error deserializing message " << msg->type();
       reply->set_reply_error();
       sender->Send(reply);
       return false;
@@ -213,7 +214,8 @@ class MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>
     bool ok = ReadSendParam(msg, &send_params);
     Message* reply = SyncMessage::GenerateReply(msg);
     if (!ok) {
-      NOTREACHED() << "Error deserializing message " << msg->type();
+      NOTREACHED_IN_MIGRATION()
+          << "Error deserializing message " << msg->type();
       reply->set_reply_error();
       obj->Send(reply);
       return false;
@@ -235,7 +237,8 @@ class MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>
     bool ok = ReadSendParam(msg, &send_params);
     Message* reply = SyncMessage::GenerateReply(msg);
     if (!ok) {
-      NOTREACHED() << "Error deserializing message " << msg->type();
+      NOTREACHED_IN_MIGRATION()
+          << "Error deserializing message " << msg->type();
       reply->set_reply_error();
       obj->Send(reply);
       return false;

ipc/ipc_message_utils.cc

@@ -305,7 +305,7 @@ bool ReadValue(const base::Pickle* pickle,
       break;
     }
     default:
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return false;
   }
 
@@ -427,7 +427,7 @@ bool ParamTraits<double>::Read(const base::Pickle* m,
                                param_type* r) {
   const char *data;
   if (!iter->ReadBytes(&data, sizeof(*r))) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return false;
   }
   memcpy(r, data, sizeof(param_type));
@@ -560,10 +560,10 @@ void ParamTraits<base::FileDescriptor>::Write(base::Pickle* m,
   if (p.auto_close) {
     if (!m->WriteAttachment(
             new internal::PlatformFileAttachment(base::ScopedFD(p.fd))))
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   } else {
     if (!m->WriteAttachment(new internal::PlatformFileAttachment(p.fd)))
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 }
 
@@ -615,7 +615,7 @@ void ParamTraits<base::ScopedFD>::Write(base::Pickle* m, const param_type& p) {
 
   if (!m->WriteAttachment(new internal::PlatformFileAttachment(
           std::move(const_cast<param_type&>(p))))) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 
@@ -700,7 +700,7 @@ void ParamTraits<zx::vmo>::Write(base::Pickle* m, const param_type& p) {
 
   if (!m->WriteAttachment(new internal::HandleAttachmentFuchsia(
           std::move(const_cast<param_type&>(p))))) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 
@@ -745,7 +745,7 @@ void ParamTraits<zx::channel>::Write(base::Pickle* m, const param_type& p) {
 
   if (!m->WriteAttachment(new internal::HandleAttachmentFuchsia(
           std::move(const_cast<param_type&>(p))))) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 
@@ -1481,7 +1481,7 @@ bool ParamTraits<MSG>::Read(const base::Pickle* m,
     memcpy(r, data, sizeof(MSG));
   } else {
     result = false;
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
   return result;

ipc/ipc_sync_channel_unittest.cc

@@ -168,7 +168,7 @@ class Worker : public Listener, public Sender {
   }
 
   virtual void OnNestedTestMsg(Message* reply_msg) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 
   virtual SyncChannel* CreateChannel() {

ipc/ipc_sync_message.cc

@@ -92,7 +92,7 @@ bool SyncMessage::ReadSyncHeader(const Message& msg, SyncHeader* header) {
   base::PickleIterator iter(msg);
   bool result = iter.ReadInt(&header->message_id);
   if (!result) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return false;
   }
 

ipc/mach_port_mac.cc

@@ -16,7 +16,7 @@ namespace IPC {
 void ParamTraits<MachPortMac>::Write(base::Pickle* m, const param_type& p) {
   if (!m->WriteAttachment(
           new IPC::internal::MachPortAttachmentMac(p.get_mach_port()))) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
 }
 

ipc/message_router.cc

@@ -14,13 +14,13 @@ MessageRouter::MessageRouter() = default;
 MessageRouter::~MessageRouter() = default;
 
 bool MessageRouter::OnControlMessageReceived(const IPC::Message& msg) {
-  NOTREACHED()
+  NOTREACHED_IN_MIGRATION()
       << "should override in subclass if you care about control messages";
   return false;
 }
 
 bool MessageRouter::Send(IPC::Message* msg) {
-  NOTREACHED()
+  NOTREACHED_IN_MIGRATION()
       << "should override in subclass if you care about sending messages";
   return false;
 }

ipc/native_handle_type_converters.cc

@@ -22,7 +22,7 @@ IPC::MessageAttachment::Type TypeConverter<
     case native::SerializedHandleType::FUCHSIA_HANDLE:
       return IPC::MessageAttachment::Type::FUCHSIA_HANDLE;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return IPC::MessageAttachment::Type::MOJO_HANDLE;
 }
 
@@ -42,7 +42,7 @@ native::SerializedHandleType TypeConverter<
     case IPC::MessageAttachment::Type::FUCHSIA_HANDLE:
       return native::SerializedHandleType::FUCHSIA_HANDLE;
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return native::SerializedHandleType::MOJO_HANDLE;
 }
 

media/gpu/h264_rate_controller.cc

@@ -83,7 +83,7 @@ float Fps2MaxQP(float fps) {
           kFPS2QPTradeoffs[i].qp, kFPS2QPTradeoffs[i + 1].qp);
     }
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return 0.0f;
 }
 
@@ -98,7 +98,7 @@ float MaxQP2Fps(int max_qp) {
       return kFPS2QPTradeoffs[i + 1].fps;
     }
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return 0.0f;
 }
 }  // namespace

mojo/core/channel.cc

@@ -114,7 +114,7 @@ struct IpczMessage : public Channel::Message {
   // Channel::Message:
   void SetHandles(std::vector<PlatformHandle>) override { NOTREACHED(); }
   void SetHandles(std::vector<PlatformHandleInTransit>) override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
   }
   std::vector<PlatformHandleInTransit> TakeHandles() override {
     return std::move(handles_);
@@ -123,13 +123,13 @@ struct IpczMessage : public Channel::Message {
 
   const void* data() const override { return data_.get(); }
   void* mutable_data() const override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return nullptr;
   }
   size_t capacity() const override { return size_; }
 
   bool ExtendPayload(size_t) override {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     return false;
   }
 
@@ -1112,7 +1112,7 @@ MOJO_SYSTEM_IMPL_EXPORT bool Channel::SupportsChannelUpgrade() {
 }
 
 MOJO_SYSTEM_IMPL_EXPORT void Channel::OfferChannelUpgrade() {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return;
 }
 #endif

mojo/core/channel_linux.cc

@@ -61,7 +61,7 @@ void KernelVersionNumbers(int32_t* major_version,
                           int32_t* bugfix_version) {
   struct utsname info;
   if (uname(&info) < 0) {
-    NOTREACHED();
+    NOTREACHED_IN_MIGRATION();
     *major_version = 0;
     *minor_version = 0;
     *bugfix_version = 0;

mojo/core/channel_mac.cc

@@ -62,7 +62,7 @@ class ChannelMac : public Channel,
     } else if (channel_handle.is_mach_receive()) {
       receive_port_ = channel_handle.TakeMachReceiveRight();
     } else {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
     }
   }
 
@@ -212,7 +212,7 @@ class ChannelMac : public Channel,
       DCHECK(send_port_ == MACH_PORT_NULL);
       // Wait for the received message via the MessageLoop.
     } else {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
     }
 
     base::CurrentThread::Get()->AddDestructionObserver(this);
@@ -428,8 +428,8 @@ class ChannelMac : public Channel,
           break;
         }
         default:
-          NOTREACHED() << "Unsupported handle type "
+          NOTREACHED_IN_MIGRATION()
-                       << static_cast<int>(handle.type());
+              << "Unsupported handle type " << static_cast<int>(handle.type());
           OnWriteErrorLocked(Error::kDisconnected);
       }
     }

mojo/core/core_ipcz.cc

@@ -104,7 +104,7 @@ MojoResult GetMojoWriteResultForIpczPut(IpczResult result) {
 extern "C" {
 
 MojoResult MojoInitializeIpcz(const struct MojoInitializeOptions* options) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return MOJO_RESULT_OK;
 }
 
@@ -729,7 +729,7 @@ MojoResult MojoUnwrapPlatformSharedMemoryRegionIpcz(
       break;
     default:
       *access_mode = MOJO_PLATFORM_SHARED_MEMORY_REGION_ACCESS_MODE_READ_ONLY;
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
   }
 
   std::ignore = ipcz_driver::SharedBuffer::Unbox(mojo_handle);
@@ -844,7 +844,7 @@ MojoResult MojoQueryQuotaIpcz(MojoHandle handle,
 }
 
 MojoResult MojoShutdownIpcz(const MojoShutdownOptions* options) {
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return MOJO_RESULT_OK;
 }
 

mojo/core/entrypoints.cc

@@ -22,7 +22,8 @@ mojo::core::Core* g_core;
 extern "C" {
 
 MojoResult MojoInitializeImpl(const struct MojoInitializeOptions* options) {
-  NOTREACHED() << "Do not call MojoInitialize() as a Mojo Core embedder!";
+  NOTREACHED_IN_MIGRATION()
+      << "Do not call MojoInitialize() as a Mojo Core embedder!";
   return MOJO_RESULT_UNIMPLEMENTED;
 }
 
@@ -354,7 +355,8 @@ MojoResult MojoQueryQuotaImpl(MojoHandle handle,
 }
 
 MojoResult MojoShutdownImpl(const MojoShutdownOptions* options) {
-  NOTREACHED() << "Do not call MojoShutdown() as a Mojo Core embedder!";
+  NOTREACHED_IN_MIGRATION()
+      << "Do not call MojoShutdown() as a Mojo Core embedder!";
   return MOJO_RESULT_UNIMPLEMENTED;
 }
 

mojo/core/handle_table.cc

@@ -34,7 +34,7 @@ const char* GetNameForDispatcherType(Dispatcher::Type type) {
     case Dispatcher::Type::INVITATION:
       return "invitation";
   }
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return "unknown";
 }
 

mojo/core/ipcz_driver/base_shared_memory_service.cc

@@ -180,7 +180,7 @@ base::WritableSharedMemoryRegion BaseSharedMemoryService::CreateWritableRegion(
 #else
   // The shared memory service is not needed on other platforms, so this method
   // should never be called.
-  NOTREACHED();
+  NOTREACHED_IN_MIGRATION();
   return {};
 #endif
 }

mojo/core/ipcz_driver/mojo_trap.cc

@@ -343,7 +343,7 @@ MojoResult MojoTrap::Arm(MojoTrapEvent* blocking_events,
     }
 
     if (result != IPCZ_RESULT_FAILED_PRECONDITION) {
-      NOTREACHED();
+      NOTREACHED_IN_MIGRATION();
       return result;
     }