Revert 125441 - In CrMallocErrorBreak, do not kill the process if errno is ENOMEM.

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"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
 #if defined(OS_LINUX)
+#include <errno.h>
 #include <malloc.h>
 #include <glib.h>
 #include <sched.h>
 #endif
 #if defined(OS_POSIX)
-#include <errno.h>
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #endif
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #if defined(OS_MACOSX)
-#include <mach/vm_param.h>
 #include <malloc/malloc.h>
 #include "base/process_util_unittest_mac.h"
 #endif
 
 namespace {
 
 #if defined(OS_WIN)
 const wchar_t kProcessName[] = L"base_unittests.exe";
 #else
 const wchar_t kProcessName[] = L"base_unittests";
@@ skipping 390 matching lines @@
       this->MakeCmdLine("SimpleChildProcess", false).GetCommandLineString();
   base::LaunchOptions options;
   options.as_user = token;
   EXPECT_TRUE(base::LaunchProcess(cmdline, options, NULL));
 }
 
 #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_F(ProcessUtilTest, MacTerminateOnHeapCorruption) {
+  // 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_F(ProcessUtilTest, MacMallocFailureDoesNotTerminate) {
-  // Test that ENOMEM doesn't crash. The number of bytes is one less than
-  // MALLOC_ABSOLUTE_MAX_SIZE, above which the system early-returns NULL and
-  // does not call through malloc_error_break(). See the comment at
-  // EnableTerminationOnOutOfMemory() for more information.
-  void* buf = malloc(std::numeric_limits<size_t>::max() - (2 * PAGE_SIZE) - 1);
-
-  // The optimizer can be too efficient in Release mode, so alias the value.
-  base::debug::Alias(buf);
-
-  EXPECT_FALSE(buf);
-  EXPECT_EQ(ENOMEM, errno);
-}
-
-TEST_F(ProcessUtilTest, MacTerminateOnHeapCorruption) {
-  // Assert that freeing an unallocated pointer will crash the process.
   char buf[3];
 #ifndef ADDRESS_SANITIZER
   ASSERT_DEATH(free(buf), "being freed.*"
       "\\*\\*\\* set a breakpoint in malloc_error_break to debug.*"
       "Terminating process due to a potential for future heap corruption");
 #else
   // 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");
@@ skipping 690 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)