| Index: base/test/test_suite.cc
|
| diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
|
| index 82510a20c6b282f9df2ccd804bf1d7a0b4018f38..34e8e118c9f0514a882e195a804dfdcf344cc158 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,14 @@ void TestSuite::Initialize() {
|
|
|
| CHECK(debug::EnableInProcessStackDumping());
|
| #if defined(OS_WIN)
|
| +#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.
|
|
|