summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 23:44:31 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 23:44:31 +0000
commit9dcbb627b110dc667cb64dcd9a6cbbf918fc337e (patch)
treecf64c386fc7b912a5872e68158913afe7c0d8af4 /chrome
parent564c19c2cf483ccbfba13d99ba8a0bfaa7edd25b (diff)
downloadchromium_src-9dcbb627b110dc667cb64dcd9a6cbbf918fc337e.zip
chromium_src-9dcbb627b110dc667cb64dcd9a6cbbf918fc337e.tar.gz
chromium_src-9dcbb627b110dc667cb64dcd9a6cbbf918fc337e.tar.bz2
Mark ServiceProcessStateTest.ForceShutdown as flaky on Windows.
BUG=84854 TEST=none Review URL: http://codereview.chromium.org/9174018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/service_process_util_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index eccc4ff..5de195d 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -36,7 +36,7 @@
// somewhat flaky on other Linux.
#define MAYBE_ForceShutdown FAILS_ForceShutdown
#else
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
#define MAYBE_ForceShutdown FLAKY_ForceShutdown
#else
#define MAYBE_ForceShutdown ForceShutdown