summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r--chrome/browser/errorpage_uitest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index 6c162aa..ae33894 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -186,7 +186,8 @@ TEST_F(ErrorPageTest, IFrameDNSError_GoBack) {
EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness"));
}
-TEST_F(ErrorPageTest, IFrameDNSError_GoBackAndForward) {
+// Flaky on Linux too.
+TEST_F(ErrorPageTest, FLAKY_IFrameDNSError_GoBackAndForward) {
#if defined(OS_WIN)
// Flaky on XP, http://crbug.com/19361.
if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)