Index: third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc |
=================================================================== |
--- third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc (revision 124832) |
+++ third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc (working copy) |
@@ -33,7 +33,7 @@ |
#include <stdio.h> |
#include <stdlib.h> |
#include <vector> |
-#include "gperftools/malloc_extension.h" |
+#include "google/malloc_extension.h" |
#include "base/logging.h" |
using std::vector; |
@@ -75,10 +75,7 @@ |
// This flag won't be compiled in in opt mode. |
DECLARE_int32(max_free_queue_size); |
-// Test match as well as mismatch rules. But do not test on OS X; on |
-// OS X the OS converts new/new[] to malloc before it gets to us, so |
-// we are unable to catch these mismatch errors. |
-#ifndef __APPLE__ |
+// Test match as well as mismatch rules: |
TEST(DebugAllocationTest, DeallocMismatch) { |
// malloc can be matched only by free |
// new can be matched only by delete and delete(nothrow) |
@@ -135,7 +132,6 @@ |
::operator delete[](y, std::nothrow); |
} |
} |
-#endif // #ifdef OS_MACOSX |
TEST(DebugAllocationTest, DoubleFree) { |
int* pint = new int; |