Revert 227219 "Revert 226920 "Roll Clang 188423:191856.""

trunk/src/base/security_unittest.cc

Index: trunk/src/base/security_unittest.cc
===================================================================
--- trunk/src/base/security_unittest.cc	(revision 228317)
+++ trunk/src/base/security_unittest.cc	(working copy)
@@ -75,14 +75,11 @@
 }
 
 bool CallocDiesOnOOM() {
+// The sanitizers' calloc dies on OOM instead of returning NULL.
 // The wrapper function in base/process_util_linux.cc that is used when we
 // compile without TCMalloc will just die on OOM instead of returning NULL.
-// This function is explicitly disabled if we compile with AddressSanitizer,
-// MemorySanitizer or ThreadSanitizer.
-#if defined(OS_LINUX) && defined(NO_TCMALLOC) && \
-    (!defined(ADDRESS_SANITIZER) && \
-     !defined(MEMORY_SANITIZER) && \
-     !defined(THREAD_SANITIZER))
+#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
+    defined(THREAD_SANITIZER) || (defined(OS_LINUX) && defined(NO_TCMALLOC))
   return true;
 #else
   return false;