summaryrefslogtreecommitdiffstats
path: root/chrome/browser/crash_recovery_browsertest.cc
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 16:06:34 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 16:06:34 +0000
commite3ad0a84837898a3f7621c712b1202b1d31ca6e6 (patch)
treeb912e2b79a787c43858c211b638aefbe124e49b4 /chrome/browser/crash_recovery_browsertest.cc
parent8cd100c10901818b99f46d5f09886812facd598a (diff)
downloadchromium_src-e3ad0a84837898a3f7621c712b1202b1d31ca6e6.zip
chromium_src-e3ad0a84837898a3f7621c712b1202b1d31ca6e6.tar.gz
chromium_src-e3ad0a84837898a3f7621c712b1202b1d31ca6e6.tar.bz2
Enable CrashRecoveryBrowserTest.Reload back.
TBR=dimich@chromium.org BUG=61097 TEST=none Review URL: http://codereview.chromium.org/4120009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/crash_recovery_browsertest.cc')
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index 89472df..71d6a5d 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -31,12 +31,12 @@ class CrashRecoveryBrowserTest : public InProcessBrowserTest {
// be fixed before it can be enabled to not cause the bots issues.
#if defined(OS_MACOSX)
#define MAYBE_Reload DISABLED_Reload
+#else
+#define MAYBE_Reload Reload
#endif
// Test that reload works after a crash.
-// Times out on all platforms after WebKit roll 70722:70770.
-// http://crbug.com/61097
-IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DISABLED_Reload) {
+IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) {
// The title of the active tab should change each time this URL is loaded.
GURL url(
"data:text/html,<script>document.title=new Date().valueOf()</script>");