mac: Hook up allocator shim during app startup.

base/process/memory_unittest.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.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include "base/process/memory.h"
 
 #include <stddef.h>
 
 #include <limits>
 
 #include "base/allocator/allocator_check.h"
 #include "base/allocator/features.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/memory/aligned_memory.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #if defined(OS_POSIX)
 #include <errno.h>
 #endif
 #if defined(OS_MACOSX)
 #include <malloc/malloc.h>
+#include "base/allocator/allocator_shim.h"
 #include "base/process/memory_unittest_mac.h"
 #endif
 #if defined(OS_LINUX)
 #include <malloc.h>
 #include "base/test/malloc_wrapper.h"
 #endif
 
 #if defined(OS_WIN)
 
 #if defined(_MSC_VER)
@@ skipping 12 matching lines @@
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 
 // For the following Mac tests:
 // Note that base::EnableTerminationOnHeapCorruption() is called as part of
 // test suite setup and does not need to be done again, else mach_override
 // will fail.
 
 TEST(ProcessMemoryTest, MacTerminateOnHeapCorruption) {
+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
+  base::allocator::InitializeAllocatorShim();
+#endif
   // Assert that freeing an unallocated pointer will crash the process.
   char buf[9];
   asm("" : "=r" (buf));  // Prevent clang from being too smart.
 #if ARCH_CPU_64_BITS
   // On 64 bit Macs, the malloc system automatically abort()s on heap corruption
   // but does not output anything.
   ASSERT_DEATH(free(buf), "");
 #elif defined(ADDRESS_SANITIZER)
   // AddressSanitizer replaces malloc() and prints a different error message on
   // heap corruption.
   ASSERT_DEATH(free(buf), "attempting free on address which "
       "was not malloc\\(\\)-ed");
 #else
   ADD_FAILURE() << "This test is not supported in this build configuration.";
 #endif
 }
 
 #endif  // defined(OS_MACOSX)
 
 TEST(MemoryTest, AllocatorShimWorking) {
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
+  base::allocator::InitializeAllocatorShim();
+#endif
   ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
 }
 
 // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
 // configurations: only test the real allocator.
 // Windows only supports these tests with the allocator shim in place.
 #if !defined(OS_OPENBSD) && \
     BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 
@@ skipping 15 matching lines @@
     : value_(NULL),
     // Make test size as large as possible minus a few pages so
     // that alignment or other rounding doesn't make it wrap.
     test_size_(std::numeric_limits<std::size_t>::max() - 12 * 1024),
     // A test size that is > 2Gb and will cause the allocators to reject
     // the allocation due to security restrictions. See crbug.com/169327.
     insecure_test_size_(std::numeric_limits<int>::max()),
     signed_test_size_(std::numeric_limits<ssize_t>::max()) {
   }
 
+  static void SetUpTestCase() {
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)

[Primiano Tucci (use gerrit), 2017/02/07 11:58:08]

I think you just need to move these 3 lines (#if...#endif) below in
OutOfMemoryDeathTest:: SetUpInDeathAssert()

[erikchen, 2017/02/09 23:49:04]

Done.

+    base::allocator::InitializeAllocatorShim();
+#endif
+  }
+
  protected:
   void* value_;
   size_t test_size_;
   size_t insecure_test_size_;
   ssize_t signed_test_size_;
 };
 
 class OutOfMemoryDeathTest : public OutOfMemoryTest {
  public:
   void SetUpInDeathAssert() {
@@ skipping 341 matching lines @@
   bytes = static_cast<const char*>(value_);
   for (size_t i = 0; i < (kSafeCallocItems * kSafeCallocSize); ++i)
     EXPECT_EQ(0, bytes[i]);
   free(value_);
 
   EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
   EXPECT_TRUE(value_ == NULL);
 }
 #endif  // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
         // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)