Chromium Code Reviews| Index: base/test/test_suite.cc |
| diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc |
| index 82510a20c6b282f9df2ccd804bf1d7a0b4018f38..f32a5898b0d878ab1d687e9b2aa0f144fbf88bbb 100644 |
| --- a/base/test/test_suite.cc |
| +++ b/base/test/test_suite.cc |
| @@ -40,7 +40,10 @@ |
| #endif // OS_IOS |
| #endif // OS_MACOSX |
| -#if !defined(OS_WIN) |
| +#if defined(OS_WIN) |
| +#include "base/debug/close_handle_hook_win.h" |
| +#include "base/win/windows_version.h" |
| +#else |
| #include "base/i18n/rtl.h" |
| #if !defined(OS_IOS) |
| #include "base/strings/string_util.h" |
| @@ -317,6 +320,15 @@ void TestSuite::Initialize() { |
| CHECK(debug::EnableInProcessStackDumping()); |
| #if defined(OS_WIN) |
| + __debugbreak(); |
|
Will Harris
2016/01/22 18:30:39
would help if I removed my debugging __debugbreak(
Will Harris
2016/01/22 21:58:23
Done.
|
| +#if defined(_DEBUG) |
| + // Handle hooks cause shutdown asserts in Debug on Windows 7. crbug.com/571304 |
| + if (base::win::GetVersion() >= base::win::VERSION_WIN8) |
| + base::debug::InstallHandleHooks(); |
| +#else |
| + base::debug::InstallHandleHooks(); |
| +#endif |
| + |
| RouteStdioToConsole(true); |
| // Make sure we run with high resolution timer to minimize differences |
| // between production code and test code. |