Hook up allocator shim on mac.

content/app/content_main_runner.cc

 // Copyright (c) 2012 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 "content/public/app/content_main_runner.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/allocator/allocator_check.h"
 #include "base/allocator/allocator_extension.h"
+#include "base/allocator/features.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 52 matching lines @@
 #if defined(OS_WIN)
 #include <malloc.h>
 #include <cstring>
 
 #include "base/trace_event/trace_event_etw_export_win.h"
 #include "base/win/process_startup_helper.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "ui/base/win/atl_module.h"
 #include "ui/display/win/dpi.h"
 #elif defined(OS_MACOSX)
+#include "base/allocator/allocator_shim.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "content/app/mac/mac_init.h"
 #include "content/browser/mach_broker_mac.h"
 #include "content/common/sandbox_init_mac.h"
 #endif  // OS_WIN
 
 #if defined(OS_POSIX)
 #include <signal.h>
 
@@ skipping 365 matching lines @@
       Shutdown();
   }
 
   int Initialize(const ContentMainParams& params) override {
     ui_task_ = params.ui_task;
 
 #if defined(USE_AURA)
     env_mode_ = params.env_mode;
 #endif
 
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)

[Primiano Tucci (use gerrit), 2017/01/28 05:10:03]

I would probably leave this for later, once we have cleaned up naming and
everything. It might be easier for content owners to get all this when the rest
of the shim code is in codeserach.
Also I need to reason a bit more to how the suicide-on-OOM is going to work now
end to end, but I have to honestly admit that I exhausted my brain power to do
so right now.

[erikchen, 2017/01/31 02:21:22]

shrug, okay, done.

+    base::allocator::InitializeAllocatorShim();
+#endif
     base::EnableTerminationOnOutOfMemory();
 #if defined(OS_WIN)
     base::win::RegisterInvalidParamHandler();
     ui::win::CreateATLModuleIfNeeded();
 
     sandbox_info_ = *params.sandbox_info;
 #else  // !OS_WIN
 
 #if defined(OS_ANDROID)
     // See note at the initialization of ExitManager, below; basically,
@@ skipping 385 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content