Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch.

third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc

Index: third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc
===================================================================
--- third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc	(revision 94429)
+++ third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc	(working copy)
@@ -75,7 +75,10 @@
 // This flag won't be compiled in in opt mode.
 DECLARE_int32(max_free_queue_size);
 
-// Test match as well as mismatch rules:
+// 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(DebugAllocationTest, DeallocMismatch) {
   // malloc can be matched only by free
   // new can be matched only by delete and delete(nothrow)
@@ -132,6 +135,7 @@
     ::operator delete[](y, std::nothrow);
   }
 }
+#endif  // #ifdef OS_MACOSX
 
 TEST(DebugAllocationTest, DoubleFree) {
   int* pint = new int;