On heap tracking datastructure overflow, degrade instead of CHECK()

base/trace_event/heap_profiler_allocation_register_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/trace_event/heap_profiler_allocation_register.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/process/process_metrics.h"
@@ skipping 227 matching lines @@
   // Lookup should not find any garbage after removal.
   EXPECT_FALSE(reg.Get(reinterpret_cast<void*>(23), &a));
 
   reg.Remove(reinterpret_cast<void*>(17));
   reg.Remove(reinterpret_cast<void*>(19));
 
   EXPECT_FALSE(reg.Get(reinterpret_cast<void*>(17), &a));
   EXPECT_FALSE(reg.Get(reinterpret_cast<void*>(19), &a));
 }
 
-// Check that the process aborts due to hitting the guard page when inserting
-// too many elements.
-#if GTEST_HAS_DEATH_TEST
-TEST_F(AllocationRegisterTest, OverflowDeathTest) {
+// Check that the table handles overflows gracefully.
+TEST_F(AllocationRegisterTest, OverflowTest) {
   const size_t allocation_capacity = GetAllocationCapacityPerPage();
   AllocationRegister reg(allocation_capacity, kBacktraceCapacity);
   AllocationContext ctx;
   size_t i;
 
   // Fill up all of the memory allocated for the register's allocation map.
   for (i = 0; i < allocation_capacity; i++) {
     reg.Insert(reinterpret_cast<void*>(i + 1), 1, ctx);
   }
 
   // Adding just one extra element should cause overflow.
-  ASSERT_DEATH(reg.Insert(reinterpret_cast<void*>(i + 1), 1, ctx), "");
+  ASSERT_FALSE(reg.Insert(reinterpret_cast<void*>(i + 1), 1, ctx));
 }
-#endif
 
 }  // namespace trace_event
 }  // namespace base