mac: Several minor fixes to allocator shim.

chrome/installer/setup/memory_unittest.cc

Index: chrome/installer/setup/memory_unittest.cc
diff --git a/chrome/installer/setup/memory_unittest.cc b/chrome/installer/setup/memory_unittest.cc
index 30cc21a00dc4bd465202f5513bb94d39518803fe..a7968e37dcbe5cc993a34bdc117c3c34ba4efd40 100644
--- a/chrome/installer/setup/memory_unittest.cc
+++ b/chrome/installer/setup/memory_unittest.cc
@@ -9,6 +9,10 @@
 #include "base/process/memory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_MACOSX)
+#include "base/allocator/allocator_interception_mac.h"
+#endif
+
 #if defined(ALLOCATOR_SHIM)
 // Test that the allocator shim is in-place so that base::UncheckedMalloc works.
 TEST(OutOfMemoryHandledTest, UncheckedMalloc) {
@@ -31,5 +35,9 @@ TEST(OutOfMemoryHandledTest, UncheckedMalloc) {
 
   EXPECT_FALSE(base::UncheckedMalloc(kUnsafeMallocSize, &value));
   EXPECT_EQ(nullptr, value);
+
+#if defined(OS_MACOSX)
+  base::allocator::UninterceptMallocZonesForTesting();
+#endif
 }
 #endif  // ALLOCATOR_SHIM