4 files changed, 8 insertions, 2 deletions
diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc
index d671ff8..2b1e4e5 100644
--- a/chrome/test/perf/perftests.cc
+++ b/chrome/test/perf/perftests.cc
@@ -4,12 +4,14 @@
 
 #include "base/message_loop.h"
 #include "base/perftimer.h"
+#include "base/process_util.h"
 #include "chrome/common/chrome_paths.cc"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(darin): share code with base/run_all_perftests.cc
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   chrome::RegisterPathProvider();
   MessageLoop main_message_loop;
 
diff --git a/chrome/test/reliability/run_all_unittests.cc b/chrome/test/reliability/run_all_unittests.cc
index 9069b00..bb045ca 100644
--- a/chrome/test/reliability/run_all_unittests.cc
+++ b/chrome/test/reliability/run_all_unittests.cc
@@ -3,9 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
+#include "base/process_util.h"
 #include "chrome/test/reliability/reliability_test_suite.h"
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return ReliabilityTestSuite(argc, argv).Run();
 }
 
diff --git a/chrome/test/ui/run_all_unittests.cc b/chrome/test/ui/run_all_unittests.cc
index 9b7ec72..4400f9b 100644
--- a/chrome/test/ui/run_all_unittests.cc
+++ b/chrome/test/ui/run_all_unittests.cc
@@ -4,10 +4,11 @@
 
 #include "base/at_exit.h"
 #include "base/platform_thread.h"
+#include "base/process_util.h"
 #include "chrome/test/ui/ui_test_suite.h"
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   PlatformThread::SetName("Tests_Main");
   return UITestSuite(argc, argv).Run();
 }
-
diff --git a/chrome/test/unit/run_all_unittests.cc b/chrome/test/unit/run_all_unittests.cc
index 3ed4a73..97d6719 100644
--- a/chrome/test/unit/run_all_unittests.cc
+++ b/chrome/test/unit/run_all_unittests.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "build/build_config.h"
+#include "base/process_util.h"
 
 #include "base/test_suite.h"
 
@@ -12,6 +13,7 @@
 #endif
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
 #if defined(OS_WIN)
   // TODO(port): This is not Windows-specific, but needs to be ported.
   return ChromeTestSuite(argc, argv).Run();
@@ -19,4 +21,3 @@ int main(int argc, char **argv) {
   return TestSuite(argc, argv).Run();
 #endif
 }
-