summaryrefslogtreecommitdiffstats
path: root/base/test
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2016-01-25 14:11:47 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-25 22:14:10 +0000
commitd22a80067f3e4afe64a4e638579b8030d4c95248 (patch)
tree2a8a1a55693c0c306b7dedbd52e6c9b597fa5f91 /base/test
parent3c0aa77c46d827484a01662cc0eb383e7de6d93f (diff)
downloadchromium_src-d22a80067f3e4afe64a4e638579b8030d4c95248.zip
chromium_src-d22a80067f3e4afe64a4e638579b8030d4c95248.tar.gz
chromium_src-d22a80067f3e4afe64a4e638579b8030d4c95248.tar.bz2
Revert of Enable handle verifier for tests and add some tests. (patchset #7 id:120001 of https://codereview.chromium.org/1580873003/ )
Reason for revert: A lot of test are crashing on DrMemory x64 bot, so I'm reverting this speculatively. I'll reland this if it didn't help. Original issue's description: > Enable handle verifier for tests and add some tests. > > BUG=571304 > > Committed: https://crrev.com/ff6cc3d794e1285c68f74ec9ae6d59dc3e523d5b > Cr-Commit-Position: refs/heads/master@{#371075} TBR=cpu@chromium.org,wfh@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=571304,580795 Review URL: https://codereview.chromium.org/1633623003 Cr-Commit-Position: refs/heads/master@{#371330}
Diffstat (limited to 'base/test')
-rw-r--r--base/test/test_suite.cc13
1 files changed, 1 insertions, 12 deletions
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 34e8e11..82510a2 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -40,10 +40,7 @@
#endif // OS_IOS
#endif // OS_MACOSX
-#if defined(OS_WIN)
-#include "base/debug/close_handle_hook_win.h"
-#include "base/win/windows_version.h"
-#else
+#if !defined(OS_WIN)
#include "base/i18n/rtl.h"
#if !defined(OS_IOS)
#include "base/strings/string_util.h"
@@ -320,14 +317,6 @@ 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.