allocator: rename use_experimental_allocator_shim to use_allocator_shim

services/service_manager/embedder/main.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/service_manager/embedder/main.h"
 
 #include "base/allocator/features.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 47 matching lines @@
 #include <signal.h>
 
 #include "base/file_descriptor_store.h"
 #include "base/posix/global_descriptors.h"
 #endif
 
 #if defined(OS_MACOSX)
 #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)
 
 namespace service_manager {
 
 namespace {
 
 // Maximum message size allowed to be read from a Mojo message pipe in any
 // service manager embedder process.
@@ skipping 249 matching lines @@
 }  // namespace
 
 MainParams::MainParams(MainDelegate* delegate) : delegate(delegate) {}
 
 MainParams::~MainParams() {}
 
 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();
 
 #if defined(OS_LINUX)
   // The various desktop environments set this environment variable that allows
   // the dbus client library to connect directly to the bus. When this variable
   // is not set (test environments like xvfb-run), the dbus client library will
   // fall back to auto-launch mode. Auto-launch is dangerous as it can cause
   // hangs (crbug.com/715658) . This one line disables the dbus auto-launch,
@@ skipping 136 matching lines @@
   autorelease_pool.reset();
 #endif
 
   if (process_type == ProcessType::kEmbedder)
     delegate->ShutDownEmbedderProcess();
 
   return exit_code;
 }
 
 }  // namespace service_manager