MacTerminateOnHeapCorruption shouldn't leak the OOM killer into the shared test context.

base/process_util_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 <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 525 matching lines @@
 
 // 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.
 
 #if !defined(ADDRESS_SANITIZER)
 // The following code tests the system implementation of malloc() thus no need
 // to test it under AddressSanitizer.
 TEST_F(ProcessUtilTest, MacMallocFailureDoesNotTerminate) {
-  // Install the OOM killer.
-  base::EnableTerminationOnOutOfMemory();
-
   // Test that ENOMEM doesn't crash via CrMallocErrorBreak two ways: the exit
   // code and lack of the error string. The number of bytes is one less than
   // MALLOC_ABSOLUTE_MAX_SIZE, more than which the system early-returns NULL and
   // does not call through malloc_error_break(). See the comment at
   // EnableTerminationOnOutOfMemory() for more information.
   void* buf = NULL;
-  ASSERT_EXIT(
-      buf = malloc(std::numeric_limits<size_t>::max() - (2 * PAGE_SIZE) - 1),
+  ASSERT_EXIT({
+      // Install the OOM killer.
+      base::EnableTerminationOnOutOfMemory();
+
+      buf = malloc(std::numeric_limits<size_t>::max() - (2 * PAGE_SIZE) - 1);},

[Robert Sesek, 2013/04/05 18:13:22]

nit: I'd balance the } on a new line indented 4 spaces.

       testing::KilledBySignal(SIGTRAP),
       "\\*\\*\\* error: can't allocate region.*"
           "(Terminating process due to a potential for future heap "
           "corruption){0}");
 
   base::debug::Alias(buf);
 }
 #endif  // !defined(ADDRESS_SANITIZER)
 
 TEST_F(ProcessUtilTest, MacTerminateOnHeapCorruption) {
@@ skipping 715 matching lines @@
       SetUpInDeathAssert();
       while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
     }, "");
 }
 
 #endif  // !ARCH_CPU_64_BITS
 #endif  // OS_MACOSX
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
         // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)