| Index: services/service_manager/embedder/main.cc
|
| diff --git a/services/service_manager/embedder/main.cc b/services/service_manager/embedder/main.cc
|
| index f4061dbd90cebc7690fc0187712a87090d7911eb..e66149206c0b5a619bf52a1eddee2042d01e04bd 100644
|
| --- a/services/service_manager/embedder/main.cc
|
| +++ b/services/service_manager/embedder/main.cc
|
| @@ -65,7 +65,7 @@
|
| #include "base/mac/scoped_nsautorelease_pool.h"
|
| #include "services/service_manager/embedder/mac_init.h"
|
|
|
| -#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
|
| +#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
| #include "base/allocator/allocator_shim.h"
|
| #endif
|
| #endif // defined(OS_MACOSX)
|
| @@ -335,7 +335,7 @@ int Main(const MainParams& params) {
|
| MainDelegate* delegate = params.delegate;
|
| DCHECK(delegate);
|
|
|
| -#if defined(OS_MACOSX) && BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
|
| +#if defined(OS_MACOSX) && BUILDFLAG(USE_ALLOCATOR_SHIM)
|
| base::allocator::InitializeAllocatorShim();
|
| #endif
|
| base::EnableTerminationOnOutOfMemory();
|
|
|