mac: Hook up allocator shim during app startup.

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 51 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"

[Primiano Tucci (use gerrit), 2017/02/06 10:19:10]

I never if you can rely on the transitive dependency on the buildflag target
(content -> base -> base/allocator:features) or you need a direct dependency
from content -> allocator:features.
Can you check that if you do:
ninja -C out/whatever object/content/app/content_main_runner.o (or whatever is
the right path)
rm out/whatever/gen/base/allocator/features.h
ninja -C out/whatever object/content/app/content_main_runner.o 

everything works?

[erikchen, 2017/02/06 21:22:18]

Done.

 #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 369 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)
+    base::allocator::InitializeAllocatorShim();
+#endif
     base::EnableTerminationOnOutOfMemory();

[Primiano Tucci (use gerrit), 2017/02/06 10:19:10]

I think you need to update EnableTerminationOnOutOfMemory in memory_mac.mm and
do:

#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
  allocator::SetCallNewHandlerOnMallocFailure(true);
#endif

similarly to what happens in memory_linux.cc

Otherwise I think that when you enable the shim you will lose the suicide-on-oom
for the default malloc zone.
I'd expect this to make the OutOfMemoryDeathTest in memory_unittest.cc fail
(alright, the build flag is not enabled by default right now, that's why you
won't see this unless you run manually base_unittest).
If you run base_unittests do you see the failure?
If yes: it's all great, fix EnableTerminationOnOOM
If no:
 Option A: I am misunderstanding something
 Option B: the OutOfMemoryDeathTest are broken on mac and we should figure out
why

[erikchen, 2017/02/06 21:22:18]

Tests were passing because we weren't initializing the allocator shim in tests.
I've added the requisite plumbing and locally, tests pass with both
_default_use_experimental_allocator_shim=true and
_default_use_experimental_allocator_shim=false

 #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,
     // only Android builds have the ctor/dtor handlers set up to use
@@ skipping 384 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content