base/security: re-enable security check on ASAN

Re-enable the check for calloc() overflow on ASAN now that it is
fixed.

BUG=175554
NOTRY=true


Review URL: https://chromiumcodereview.appspot.com/13077004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192354 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/base/security_unittest.cc b/base/security_unittest.cc
index 8f08f11..e6e22a0 100644
--- a/base/security_unittest.cc
+++ b/base/security_unittest.cc
@@ -150,10 +150,10 @@ TEST(SecurityTest, TCMALLOC_TEST(MemoryAllocationRestrictionsNewArray)) {
   #define DISABLE_ON_IOS_AND_WIN(function) function
 #endif
 
-#if defined(ADDRESS_SANITIZER)
-  #define DISABLE_ON_ASAN(function) DISABLED_##function
+#if defined(ADDRESS_SANITIZER) && defined(OS_MACOSX)
+  #define DISABLE_ON_MAC_WITH_ASAN(function) DISABLED_##function
 #else
-  #define DISABLE_ON_ASAN(function) function
+  #define DISABLE_ON_MAC_WITH_ASAN(function) function
 #endif
 
 // There are platforms where these tests are known to fail. We would like to
@@ -215,9 +215,8 @@ bool CallocReturnsNull(size_t nmemb, size_t size) {
   return HideValueFromCompiler(array_pointer.get()) == NULL;
 }
 
-// Test if calloc() can overflow. Disable on ASAN for now since the
-// overflow seems present there (crbug.com/175554).
-TEST(SecurityTest, DISABLE_ON_ASAN(CallocOverflow)) {
+// Test if calloc() can overflow.
+TEST(SecurityTest, DISABLE_ON_MAC_WITH_ASAN(CallocOverflow)) {
   const size_t kArraySize = 4096;
   const size_t kMaxSizeT = numeric_limits<size_t>::max();
   const size_t kArraySize2 = kMaxSizeT / kArraySize + 10;