summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 14:48:33 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 14:48:33 +0000
commita84eeec415f234713e856748dbff23af8ca51afb (patch)
treee493e154c8cbe45a85d02954696317f053a00075 /chrome
parent0b7ca928a0423e59725a94a69f9f45b047f300a6 (diff)
downloadchromium_src-a84eeec415f234713e856748dbff23af8ca51afb.zip
chromium_src-a84eeec415f234713e856748dbff23af8ca51afb.tar.gz
chromium_src-a84eeec415f234713e856748dbff23af8ca51afb.tar.bz2
Disable CrashRecoveryBrowserTest.LoadInNewTab as it times out occasionally.
BUG=57158 TEST=none TBR=phajdan.jr git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index b37c1a5..620f7eb 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -32,6 +32,9 @@ class CrashRecoveryBrowserTest : public InProcessBrowserTest {
#if defined(OS_MACOSX)
#define MAYBE_Reload DISABLED_Reload
#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab
+#elif defined(OS_WIN)
+// http://crbug.com/57158 - Times out sometimes on windows.
+#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab
#else
#define MAYBE_Reload Reload
#define MAYBE_LoadInNewTab LoadInNewTab