| Index: base/debug/thread_heap_usage_tracker.cc
 | 
| diff --git a/base/debug/thread_heap_usage_tracker.cc b/base/debug/thread_heap_usage_tracker.cc
 | 
| index 153653639457c22fbefb6e1364b3bcd0e1ba990f..060fbe268b817cf30832ef1c50d7944a1809f543 100644
 | 
| --- a/base/debug/thread_heap_usage_tracker.cc
 | 
| +++ b/base/debug/thread_heap_usage_tracker.cc
 | 
| @@ -288,11 +288,11 @@ void ThreadHeapUsageTracker::EnableHeapTracking() {
 | 
|  
 | 
|    CHECK_EQ(false, g_heap_tracking_enabled) << "No double-enabling.";
 | 
|    g_heap_tracking_enabled = true;
 | 
| -#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
 | 
| +#if BUILDFLAG(USE_ALLOCATOR_SHIM)
 | 
|    base::allocator::InsertAllocatorDispatch(&allocator_dispatch);
 | 
|  #else
 | 
|    CHECK(false) << "Can't enable heap tracking without the shim.";
 | 
| -#endif  // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
 | 
| +#endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
 | 
|  }
 | 
|  
 | 
|  bool ThreadHeapUsageTracker::IsHeapTrackingEnabled() {
 | 
| @@ -300,11 +300,11 @@ bool ThreadHeapUsageTracker::IsHeapTrackingEnabled() {
 | 
|  }
 | 
|  
 | 
|  void ThreadHeapUsageTracker::DisableHeapTrackingForTesting() {
 | 
| -#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
 | 
| +#if BUILDFLAG(USE_ALLOCATOR_SHIM)
 | 
|    base::allocator::RemoveAllocatorDispatchForTesting(&allocator_dispatch);
 | 
|  #else
 | 
|    CHECK(false) << "Can't disable heap tracking without the shim.";
 | 
| -#endif  // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
 | 
| +#endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
 | 
|    DCHECK_EQ(true, g_heap_tracking_enabled) << "Heap tracking not enabled.";
 | 
|    g_heap_tracking_enabled = false;
 | 
|  }
 | 
| 
 |