Rename IMMEDIATE_CRASH() -> base::ImmediateCrash()

This is now a [[noreturn]] function instead of a macro. The macro itself
is kept around for now to avoid having to revert this change in case
another IMMEDIATE_CRASH() is added or there exists such calls somewhere
outside src/ that I'm unaware of.

Bug: None
Change-Id: Ibc7921bf7302c94ce151c83a230af5f11fb7b71d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3999129
Reviewed-by: danakj <danakj@chromium.org>
Auto-Submit: Peter Boström <pbos@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1066781}
diff --git a/base/allocator/partition_alloc_support.cc b/base/allocator/partition_alloc_support.cc
index 54781e0..1b83b3f 100644
--- a/base/allocator/partition_alloc_support.cc
+++ b/base/allocator/partition_alloc_support.cc
@@ -503,7 +503,7 @@
                << "The dangling raw_ptr was released at:\n"
                << stack_trace_release << task_trace_release;
   }
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 
 void ClearDanglingRawPtrBuffer() {
@@ -557,7 +557,7 @@
   LOG(ERROR) << "Detected dangling raw_ptr in unretained with id="
              << StringPrintf("0x%016" PRIxPTR, id) << ":\n\n"
              << task_trace << stack_trace;
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 
 void InstallUnretainedDanglingRawPtrChecks() {
diff --git a/base/android/orderfile/orderfile_call_graph_instrumentation.cc b/base/android/orderfile/orderfile_call_graph_instrumentation.cc
index 00b754a..a2a3660 100644
--- a/base/android/orderfile/orderfile_call_graph_instrumentation.cc
+++ b/base/android/orderfile/orderfile_call_graph_instrumentation.cc
@@ -180,7 +180,7 @@
     // Only the code in the native library is instrumented. Callees are expected
     // to be within the native library bounds.
     Disable();
-    IMMEDIATE_CRASH();
+    ImmediateCrash();
   }
 
   size_t offset = callee_address - start;
diff --git a/base/android/orderfile/orderfile_instrumentation.cc b/base/android/orderfile/orderfile_instrumentation.cc
index da73d4d32..2b0983ff 100644
--- a/base/android/orderfile/orderfile_instrumentation.cc
+++ b/base/android/orderfile/orderfile_instrumentation.cc
@@ -139,7 +139,7 @@
       // deadlock.  By crashing immediately we at least have a chance to get a
       // stack trace from the system to give some clue about the nature of the
       // problem.
-      IMMEDIATE_CRASH();
+      ImmediateCrash();
     }
 
     // We should really crash at the first instance, but it does happen on bots,
diff --git a/base/check.h b/base/check.h
index 3fbd09c..ea8ef67b 100644
--- a/base/check.h
+++ b/base/check.h
@@ -117,7 +117,7 @@
 // Note that this uses IMMEDIATE_CRASH_ALWAYS_INLINE to force-inline in debug
 // mode as well. See LoggingTest.CheckCausesDistinctBreakpoints.
 [[noreturn]] IMMEDIATE_CRASH_ALWAYS_INLINE void CheckFailure() {
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 }
 
 // Discard log strings to reduce code bloat.
diff --git a/base/check_example.cc b/base/check_example.cc
index 6c00cd0..3bfc184 100644
--- a/base/check_example.cc
+++ b/base/check_example.cc
@@ -18,7 +18,7 @@
 // See https://crbug.com/672699.
 
 #define BLINK_RELEASE_ASSERT_EQUIVALENT(assertion) \
-  (UNLIKELY(!(assertion)) ? (IMMEDIATE_CRASH()) : (void)0)
+  (UNLIKELY(!(assertion)) ? (base::ImmediateCrash()) : (void)0)
 
 void DoCheck(bool b) {
   CHECK(b) << "DoCheck " << b;
diff --git a/base/files/scoped_file_linux.cc b/base/files/scoped_file_linux.cc
index 6fd3eec6..e72b5b724 100644
--- a/base/files/scoped_file_linux.cc
+++ b/base/files/scoped_file_linux.cc
@@ -29,7 +29,7 @@
 NOINLINE void CrashOnFdOwnershipViolation() {
   RAW_LOG(ERROR, "Crashing due to FD ownership violation:\n");
   base::debug::StackTrace().Print();
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 }
 
 bool CanTrack(int fd) {
diff --git a/base/immediate_crash_unittest.cc b/base/immediate_crash_unittest.cc
index 806e2fc..eb38509 100644
--- a/base/immediate_crash_unittest.cc
+++ b/base/immediate_crash_unittest.cc
@@ -23,10 +23,10 @@
 
 namespace {
 
-// If IMMEDIATE_CRASH() is not treated as noreturn by the compiler, the compiler
+// If ImmediateCrash() is not treated as noreturn by the compiler, the compiler
 // will complain that not all paths through this function return a value.
 [[maybe_unused]] int TestImmediateCrashTreatedAsNoReturn() {
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 
 #if defined(ARCH_CPU_X86_FAMILY)
@@ -201,13 +201,13 @@
 
 }  // namespace
 
-// Attempts to verify the actual instructions emitted by IMMEDIATE_CRASH().
+// Attempts to verify the actual instructions emitted by ImmediateCrash().
 // While the test results are highly implementation-specific, this allows macro
 // changes (e.g. CLs like https://crrev.com/671123) to be verified using the
 // trybots/waterfall, without having to build and disassemble Chrome on
 // multiple platforms. This makes it easier to evaluate changes to
-// IMMEDIATE_CRASH() against its requirements (e.g. size of emitted sequence,
-// whether or not multiple IMMEDIATE_CRASH sequences can be folded together, et
+// ImmediateCrash() against its requirements (e.g. size of emitted sequence,
+// whether or not multiple ImmediateCrash sequences can be folded together, et
 // cetera). Please see immediate_crash.h for more details about the
 // requirements.
 //
diff --git a/base/libcpp_hardening_test.cc b/base/libcpp_hardening_test.cc
index bb516d99..fef2062 100644
--- a/base/libcpp_hardening_test.cc
+++ b/base/libcpp_hardening_test.cc
@@ -46,7 +46,7 @@
 //
 // We also have to prevent this test from running on Android because even though
 // death tests are supported on Android, GTest death tests don't work with
-// IMMEDIATE_CRASH() (https://crbug.com/1353549#c2).
+// base::ImmediateCrash() (https://crbug.com/1353549#c2).
 #if GTEST_HAS_DEATH_TEST && !GTEST_OS_LINUX_ANDROID
   EXPECT_DEATH(vec[3], Not(ContainsRegex(".*assertion.*failed:")));
 #else
diff --git a/base/logging.cc b/base/logging.cc
index f934ccb..5a432f0 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -956,7 +956,7 @@
 #endif
 
       // Crash the process to generate a dump.
-      IMMEDIATE_CRASH();
+      base::ImmediateCrash();
     }
   }
 }
@@ -1194,7 +1194,7 @@
   }
 
   if (level == LOGGING_FATAL)
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
 }
 
 // This was defined at the beginning of this file.
diff --git a/base/nodebug_assertion.cc b/base/nodebug_assertion.cc
index e257041..f9860cee 100644
--- a/base/nodebug_assertion.cc
+++ b/base/nodebug_assertion.cc
@@ -11,7 +11,7 @@
 
 _LIBCPP_NORETURN BASE_EXPORT void __libcpp_verbose_abort(char const* format,
                                                          ...) {
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 }
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/base/process/process_stubs.cc b/base/process/process_stubs.cc
index b8a1eee..b819b0b 100644
--- a/base/process/process_stubs.cc
+++ b/base/process/process_stubs.cc
@@ -48,7 +48,7 @@
 void Process::TerminateCurrentProcessImmediately(int exit_code) {
   // This method is marked noreturn, so we crash rather than just provide an
   // empty stub implementation.
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 
 bool Process::IsValid() const {
diff --git a/base/process/process_win.cc b/base/process/process_win.cc
index ea56447..7503838 100644
--- a/base/process/process_win.cc
+++ b/base/process/process_win.cc
@@ -86,7 +86,7 @@
   ::TerminateProcess(GetCurrentProcess(), static_cast<UINT>(exit_code));
   // There is some ambiguity over whether the call above can return. Rather than
   // hitting confusing crashes later on we should crash right here.
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 
 bool Process::IsValid() const {
diff --git a/base/test/immediate_crash_test_helper.cc b/base/test/immediate_crash_test_helper.cc
index 3a2eb9c..ff205b88 100644
--- a/base/test/immediate_crash_test_helper.cc
+++ b/base/test/immediate_crash_test_helper.cc
@@ -15,17 +15,17 @@
 
 IMMEDIATE_CRASH_TEST_HELPER_EXPORT int TestFunction1(int x, int y) {
   if (x < 1)
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   if (y < 1)
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   return x + y;
 }
 
 IMMEDIATE_CRASH_TEST_HELPER_EXPORT int TestFunction2(int x, int y) {
   if (x < 2)
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   if (y < 2)
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   return x * y;
 }
 
diff --git a/base/test/launcher/test_launcher_unittest.cc b/base/test/launcher/test_launcher_unittest.cc
index 977d85f8..b52b051 100644
--- a/base/test/launcher/test_launcher_unittest.cc
+++ b/base/test/launcher/test_launcher_unittest.cc
@@ -1127,7 +1127,7 @@
 }
 // Basic test to crash
 TEST(MockUnitTests, DISABLED_CrashTest) {
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 // Basic test will not be reached, due to the preceding crash in the same batch.
 TEST(MockUnitTests, DISABLED_NoRunTest) {
diff --git a/base/win/atl_throw.cc b/base/win/atl_throw.cc
index 252fd54..7e86c86 100644
--- a/base/win/atl_throw.cc
+++ b/base/win/atl_throw.cc
@@ -18,7 +18,7 @@
   base::debug::Alias(&hr);
   if (hr == E_OUTOFMEMORY)
     base::TerminateBecauseOutOfMemory(0);
-  IMMEDIATE_CRASH();
+  ImmediateCrash();
 }
 
 }  // namespace win
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 305617d3..6cd3036 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -1456,7 +1456,7 @@
       // before crashpad is initialized. Please leave this check immediately
       // before the crashpad initialization; the amount of memory used at this
       // point is important to the test.
-      IMMEDIATE_CRASH();
+      base::ImmediateCrash();
     }
 #if BUILDFLAG(IS_ANDROID)
     crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 693db42..7b37750b 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -356,7 +356,7 @@
 void HandleTestParameters(const base::CommandLine& command_line) {
   // This parameter causes a null pointer crash (crash reporter trigger).
   if (command_line.HasSwitch(switches::kBrowserCrashTest)) {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 }
 
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
index 93c98f4..5a74ea6d 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
@@ -31,7 +31,7 @@
 #if DCHECK_IS_ON()
   return "whitelist for device-local accounts";
 #else
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 #endif
 }
 
diff --git a/chrome/browser/chromeos/extensions/signin_screen_policy_provider.cc b/chrome/browser/chromeos/extensions/signin_screen_policy_provider.cc
index ef378ee..66cf1526 100644
--- a/chrome/browser/chromeos/extensions/signin_screen_policy_provider.cc
+++ b/chrome/browser/chromeos/extensions/signin_screen_policy_provider.cc
@@ -36,7 +36,7 @@
 #if DCHECK_IS_ON()
   return "Guard for sign-in screen";
 #else
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 #endif
 }
 
diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc
index 9c614910..f20685a 100644
--- a/chrome/browser/extensions/standard_management_policy_provider.cc
+++ b/chrome/browser/extensions/standard_management_policy_provider.cc
@@ -76,7 +76,7 @@
 #if DCHECK_IS_ON()
   return "extension management policy controlled settings";
 #else
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 #endif
 }
 
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index a004774..e1692f33 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -763,7 +763,7 @@
 #if DCHECK_IS_ON()
   return "Supervised User Service";
 #else
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 #endif
 }
 
diff --git a/chrome/browser/ui/views/page_action/page_action_icon_controller.cc b/chrome/browser/ui/views/page_action/page_action_icon_controller.cc
index 798cd60..e7e5373 100644
--- a/chrome/browser/ui/views/page_action/page_action_icon_controller.cc
+++ b/chrome/browser/ui/views/page_action/page_action_icon_controller.cc
@@ -274,7 +274,7 @@
       return page_action.first;
     }
   }
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 }
 
 void PageActionIconController::UpdateAll() {
diff --git a/components/crash/core/app/crashpad.cc b/components/crash/core/app/crashpad.cc
index afa205b..9ad09dfe 100644
--- a/components/crash/core/app/crashpad.cc
+++ b/components/crash/core/app/crashpad.cc
@@ -59,8 +59,8 @@
                    const char* prefix_end,
                    const char* buf_end) {
   // This simulates that a CHECK(false) was done at file:line instead of here.
-  // This is used instead of IMMEDIATE_CRASH() to give better error messages
-  // locally (printed stack for one).
+  // This is used instead of base::ImmediateCrash() to give better error
+  // messages locally (printed stack for one).
   logging::CheckError::Check(file, line, "false").stream() << prefix_end;
 }
 
diff --git a/components/openscreen_platform/logging.cc b/components/openscreen_platform/logging.cc
index d94fa94..bfca9fd 100644
--- a/components/openscreen_platform/logging.cc
+++ b/components/openscreen_platform/logging.cc
@@ -49,7 +49,7 @@
 
 void Break() {
 #if defined(OFFICIAL_BUILD) && defined(NDEBUG)
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 #else
   // Chrome's base::debug::BreakDebugger is not properly annotated as
   // [[noreturn]], so we abort instead. This may need to be revisited
diff --git a/components/services/storage/test_api/test_api.cc b/components/services/storage/test_api/test_api.cc
index b16fb51..db75b5e 100644
--- a/components/services/storage/test_api/test_api.cc
+++ b/components/services/storage/test_api/test_api.cc
@@ -60,7 +60,7 @@
   }
 
   // mojom::TestApi implementation:
-  void CrashNow() override { IMMEDIATE_CRASH(); }
+  void CrashNow() override { base::ImmediateCrash(); }
 
   void ForceLeveldbDatabaseCompaction(
       const std::string& name,
diff --git a/content/browser/network_service_instance_impl.cc b/content/browser/network_service_instance_impl.cc
index d17c5e4c..a9488dab 100644
--- a/content/browser/network_service_instance_impl.cc
+++ b/content/browser/network_service_instance_impl.cc
@@ -179,7 +179,7 @@
       //
       // These cases are handled internally and so this case should never be
       // hit. It is undefined behavior to proceed in this case so CHECK here.
-      IMMEDIATE_CRASH();
+      base::ImmediateCrash();
     case SandboxGrantResult::kFailedToCreateDataDirectory:
       // A failure to create the `data_directory` is fatal, and the
       // `unsandboxed_data_path` should be used.
diff --git a/content/browser/preloading/prerender/prerender_browsertest.cc b/content/browser/preloading/prerender/prerender_browsertest.cc
index 2243df4..4e776be0 100644
--- a/content/browser/preloading/prerender/prerender_browsertest.cc
+++ b/content/browser/preloading/prerender/prerender_browsertest.cc
@@ -5803,7 +5803,7 @@
         GetPrerenderedMainFrameHost(host_id)->GetProcess();
     ScopedAllowRendererCrashes allow_renderer_crashes(process);
 #if BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_X86_FAMILY)
-    // On x86 and x86_64 Android, IMMEDIATE_CRASH() macro used in
+    // On x86 and x86_64 Android, base::ImmediateCrash() macro used in
     // ChildProcessHostImpl::CrashHungProcess() called from ForceCrash()
     // does not seem to work as expected. (See https://crbug.com/1211655)
     // We have no other ForceCrash() call sites on other than Linux and CrOS.
@@ -5925,8 +5925,9 @@
     mojo::Remote<storage::mojom::TestApi> test_api;
     StoragePartitionImpl::GetStorageServiceForTesting()->BindTestApi(
         test_api.BindNewPipeAndPassReceiver().PassPipe());
-    // On x86 and x86_64 Android, IMMEDIATE_CRASH() macro used in CrashNow()
-    // does not seem to work as expected. (See https://crbug.com/1211655)
+    // On x86 and x86_64 Android, base::ImmediateCrash() macro used in
+    // CrashNow() does not seem to work as expected. (See
+    // https://crbug.com/1211655)
     test_api->CrashNow();
     loop.Run();
   }
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 4cf227d3..0fe5ba4 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -343,8 +343,7 @@
   // the function body unique by adding a log line, so it doesn't get merged
   // with other functions by link time optimizations (ICF).
   NOINLINE void CrashHungProcess() override {
-    LOG(ERROR) << "Crashing because hung";
-    IMMEDIATE_CRASH();
+    LOG(FATAL) << "Crashing because hung";
   }
 
   void RunServiceDeprecated(
diff --git a/content/shell/utility/shell_content_utility_client.cc b/content/shell/utility/shell_content_utility_client.cc
index e01bd7e..997bdfa 100644
--- a/content/shell/utility/shell_content_utility_client.cc
+++ b/content/shell/utility/shell_content_utility_client.cc
@@ -63,7 +63,7 @@
   }
 
   void DoCrashImmediately(DoCrashImmediatelyCallback callback) override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   void CreateFolder(CreateFolderCallback callback) override {
diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc
index 64335ec..d3e395a 100644
--- a/content/test/content_browser_test_test.cc
+++ b/content/test/content_browser_test_test.cc
@@ -209,7 +209,7 @@
 }
 // Basic Test to crash
 IN_PROC_BROWSER_TEST_F(MockContentBrowserTest, DISABLED_CrashTest) {
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 }
 
 // This is disabled due to flakiness: https://crbug.com/1086372
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc
index 8dc38880..4616de4b 100644
--- a/net/dns/dns_test_util.cc
+++ b/net/dns/dns_test_util.cc
@@ -819,7 +819,7 @@
   // Session not expected to be used for anything that will actually require
   // random numbers.
   auto null_random_callback =
-      base::BindRepeating([](int, int) -> int { IMMEDIATE_CRASH(); });
+      base::BindRepeating([](int, int) -> int { base::ImmediateCrash(); });
 
   return base::MakeRefCounted<DnsSession>(
       effective_config_.value(), null_random_callback, nullptr /* net_log */);
diff --git a/net/dns/https_record_rdata.cc b/net/dns/https_record_rdata.cc
index 58693d7ad..beb9d7a6 100644
--- a/net/dns/https_record_rdata.cc
+++ b/net/dns/https_record_rdata.cc
@@ -450,7 +450,7 @@
   return base::Contains(kSupportedKeys, key);
 #else
   // Only intended for DCHECKs.
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 #endif  // DCHECK_IS_ON()
 }
 
diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc
index 21c312be..196ef2e7 100644
--- a/net/dns/mock_host_resolver.cc
+++ b/net/dns/mock_host_resolver.cc
@@ -1436,34 +1436,36 @@
     return ERR_IO_PENDING;
   }
 
-  const AddressList* GetAddressResults() const override { IMMEDIATE_CRASH(); }
+  const AddressList* GetAddressResults() const override {
+    base::ImmediateCrash();
+  }
 
   const std::vector<HostResolverEndpointResult>* GetEndpointResults()
       const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   const absl::optional<std::vector<std::string>>& GetTextResults()
       const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   const absl::optional<std::vector<HostPortPair>>& GetHostnameResults()
       const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   const std::set<std::string>* GetDnsAliasResults() const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   net::ResolveErrorInfo GetResolveErrorInfo() const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   const absl::optional<HostCache::EntryStaleness>& GetStaleInfo()
       const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   void ChangeRequestPriority(RequestPriority priority) override {}
diff --git a/net/dns/resolve_context_unittest.cc b/net/dns/resolve_context_unittest.cc
index 6bc0e28..22c5d9c 100644
--- a/net/dns/resolve_context_unittest.cc
+++ b/net/dns/resolve_context_unittest.cc
@@ -48,7 +48,7 @@
 
   scoped_refptr<DnsSession> CreateDnsSession(const DnsConfig& config) {
     auto null_random_callback =
-        base::BindRepeating([](int, int) -> int { IMMEDIATE_CRASH(); });
+        base::BindRepeating([](int, int) -> int { base::ImmediateCrash(); });
     return base::MakeRefCounted<DnsSession>(config, null_random_callback,
                                             nullptr /* netlog */);
   }
diff --git a/services/proxy_resolver/mock_proxy_host_resolver.cc b/services/proxy_resolver/mock_proxy_host_resolver.cc
index eeb6da27..d4bf523 100644
--- a/services/proxy_resolver/mock_proxy_host_resolver.cc
+++ b/services/proxy_resolver/mock_proxy_host_resolver.cc
@@ -119,7 +119,7 @@
   }
 
   const std::vector<net::IPAddress>& GetResults() const override {
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
  private:
diff --git a/services/test/echo/echo_service.cc b/services/test/echo/echo_service.cc
index 4db6108..2baaa1fe 100644
--- a/services/test/echo/echo_service.cc
+++ b/services/test/echo/echo_service.cc
@@ -39,7 +39,7 @@
 }
 
 void EchoService::Crash() {
-  IMMEDIATE_CRASH();
+  base::ImmediateCrash();
 }
 
 #if BUILDFLAG(IS_WIN)
diff --git a/third_party/blink/public/common/tokens/tokens_mojom_traits.h b/third_party/blink/public/common/tokens/tokens_mojom_traits.h
index ba14fdf..d8ec43b 100644
--- a/third_party/blink/public/common/tokens/tokens_mojom_traits.h
+++ b/third_party/blink/public/common/tokens/tokens_mojom_traits.h
@@ -56,7 +56,7 @@
       case blink::FrameToken::IndexOf<blink::RemoteFrameToken>():
         return DataView::Tag::kRemoteFrameToken;
     }
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   static const blink::LocalFrameToken& local_frame_token(
@@ -112,7 +112,7 @@
       case blink::WorkerToken::IndexOf<blink::SharedWorkerToken>():
         return DataView::Tag::kSharedWorkerToken;
     }
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   static const blink::DedicatedWorkerToken& dedicated_worker_token(
@@ -181,7 +181,7 @@
       case blink::WorkletToken::IndexOf<blink::PaintWorkletToken>():
         return DataView::Tag::kPaintWorkletToken;
     }
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   static const blink::AnimationWorkletToken& animation_worklet_token(
@@ -256,7 +256,7 @@
       case blink::ExecutionContextToken::IndexOf<blink::PaintWorkletToken>():
         return DataView::Tag::kPaintWorkletToken;
     }
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   static const blink::LocalFrameToken& local_frame_token(
@@ -321,7 +321,7 @@
           blink::DedicatedWorkerToken>():
         return DataView::Tag::kDedicatedWorkerToken;
     }
-    IMMEDIATE_CRASH();
+    base::ImmediateCrash();
   }
 
   static const blink::DocumentToken& document_token(