Enforce Terminate on Heap Corruption in most of our executable on Windows XP SP3 or Vista.

This won't submit the crash dump but it's still better than nothing.

Fix broken alignment on test_shell_main.cc.
Review URL: http://codereview.chromium.org/3105

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2546 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 0 deletions

diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index 536253f..bf0a820 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc
@@ -14,6 +14,7 @@
 #include <stdio.h>
 
 #include "base/icu_util.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/third_party/hunspell/google/bdict_reader.h"
 #include "chrome/third_party/hunspell/google/bdict_writer.h"
@@ -69,6 +70,7 @@ int PrintHelp() {
 }  // namespace
 
 int main(int argc, char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc != 2)
     return PrintHelp();
 
diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc
index ef96878..f10b69b 100644
--- a/chrome/tools/perf/flush_cache/flush_cache.cc
+++ b/chrome/tools/perf/flush_cache/flush_cache.cc
@@ -6,10 +6,12 @@
 // It's useful for testing Chrome with a cold database.
 
 #include "base/string_piece.h"
+#include "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/test/test_file_util.h"
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc <= 1) {
     fprintf(stderr, "flushes disk cache for files\n");
     fprintf(stderr, "usage: %s <filenames>\n", argv[0]);
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc
index b8484c8..99098af 100644
--- a/chrome/tools/profiles/generate_profile.cc
+++ b/chrome/tools/profiles/generate_profile.cc
@@ -11,6 +11,7 @@
 #include "base/icu_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
@@ -178,6 +179,7 @@ void InsertURLBatch(const std::wstring& profile_dir, int page_id,
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   base::AtExitManager exit_manager;
 
   int next_arg = 1;
diff --git a/chrome/tools/test/image_diff/image_diff.cc b/chrome/tools/test/image_diff/image_diff.cc
index 04c648a..7b06ed3 100644
--- a/chrome/tools/test/image_diff/image_diff.cc
+++ b/chrome/tools/test/image_diff/image_diff.cc
@@ -15,6 +15,7 @@
 #include "base/command_line.h"
 #include "base/gfx/png_decoder.h"
 #include "base/logging.h"
+#include "base/process_util.h"
 #include "base/scoped_ptr.h"
 
 // Causes the app to remain open, waiting for pairs of filenames on stdin.
@@ -228,6 +229,7 @@ int CompareImages(const char* file1, const char* file2) {
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   CommandLine parsed_command_line;
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.