summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 18:02:27 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 18:02:27 +0000
commit828533260a4f35782d343b7e2d6dbcf7385a1761 (patch)
treeb60fb010dac2cf0c768894e108aca27b95b4a4f7
parentf0f602bd331a7a37a251dfef6508fa4a23f19e6d (diff)
downloadchromium_src-828533260a4f35782d343b7e2d6dbcf7385a1761.zip
chromium_src-828533260a4f35782d343b7e2d6dbcf7385a1761.tar.gz
chromium_src-828533260a4f35782d343b7e2d6dbcf7385a1761.tar.bz2
Undisable CrashRecoveryBrowserTest.LoadInNewTab, should be OK now.
TBR=jochen BUG=144278, 57158, 29331 Review URL: https://chromiumcodereview.appspot.com/11358251 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167954 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index 0fd7c22..1dba757 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -66,15 +66,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, 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.
-// http://crbug.com/57158 - Times out sometimes on all platforms.
-#if defined(OS_LINUX)
-// http://crbug.com/144278 - failing on linux
-#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab
-#else
-#define MAYBE_LoadInNewTab LoadInNewTab
-#endif
-
-IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) {
+IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
ui_test_utils::NavigateToURL(browser(),