diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/crash_recovery_browsertest.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/crash_recovery_browsertest.cc')
| -rw-r--r-- | chrome/browser/crash_recovery_browsertest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 6cc6a0d..71d6a5d 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -31,14 +31,8 @@ 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 -#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab -#elif defined(OS_WIN) -// http://crbug.com/57158 - Times out sometimes on windows. -#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab -#define MAYBE_Reload Reload #else #define MAYBE_Reload Reload -#define MAYBE_LoadInNewTab LoadInNewTab #endif // Test that reload works after a crash. @@ -65,7 +59,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) { // There was an earlier bug (1270510) in process-per-site in which the max page // ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab // was not committed. This prevents regression of that bug. -IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) { +// http://crbug.com/57158 - Times out sometimes on all platforms. +IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DISABLED_LoadInNewTab) { const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html"); ui_test_utils::NavigateToURL(browser(), |