summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 23:55:51 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 23:55:51 +0000
commitfcb9b14eb0197b937460acba77ee164a8f0ab5ff (patch)
treea97456e0004e5feea0b3863374a8dca2632895cb /chrome/test/ui
parentff3e0eeb0fa6f57b68b56505127c9a530ce56e08 (diff)
downloadchromium_src-fcb9b14eb0197b937460acba77ee164a8f0ab5ff.zip
chromium_src-fcb9b14eb0197b937460acba77ee164a8f0ab5ff.tar.gz
chromium_src-fcb9b14eb0197b937460acba77ee164a8f0ab5ff.tar.bz2
Re-disable FastShutdown.SlowTermination on Windows
TBR=jhawkins BUG=46616 TEST=Greener Windows bots Review URL: http://codereview.chromium.org/2816008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/fast_shutdown_uitest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/ui/fast_shutdown_uitest.cc b/chrome/test/ui/fast_shutdown_uitest.cc
index f0d32f0..8db0218 100644
--- a/chrome/test/ui/fast_shutdown_uitest.cc
+++ b/chrome/test/ui/fast_shutdown_uitest.cc
@@ -25,7 +25,8 @@ class FastShutdown : public UITest {
// http://crbug.com/46614
#define MAYBE_SlowTermination FAILS_SlowTermination
#else
-#define MAYBE_SlowTermination SlowTermination
+// Times out: http://crbug.com/46616
+#define MAYBE_SlowTermination DISABLED_SlowTermination
#endif
// This tests for a previous error where uninstalling an onbeforeunload