summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/errorpage_uitest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index 8a4c3a0..56a6562 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -157,7 +157,12 @@ TEST_F(ErrorPageTest, IFrame404) {
EXPECT_TRUE(WaitForTitleMatching(L"SUCCESS"));
}
+#if defined(OS_LINUX)
+// TODO(phajdan.jr): This test is flaky on Linux, http://crbug.com/19361
+TEST_F(ErrorPageTest, DISABLED_Page404) {
+#else
TEST_F(ErrorPageTest, Page404) {
+#endif
NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"page404.html"));