summaryrefslogtreecommitdiffstats
path: root/chrome/browser/session_history_uitest.cc
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 14:07:55 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 14:07:55 +0000
commit0ced842a26fcc6bd9be368786fcff7c6428f4a05 (patch)
treebcf88f18781cb12a9e45ce42e30b5a45b0ddda85 /chrome/browser/session_history_uitest.cc
parentd01fbcbe10beb09f366aacf0756288081b548c7e (diff)
downloadchromium_src-0ced842a26fcc6bd9be368786fcff7c6428f4a05.zip
chromium_src-0ced842a26fcc6bd9be368786fcff7c6428f4a05.tar.gz
chromium_src-0ced842a26fcc6bd9be368786fcff7c6428f4a05.tar.bz2
Marking SessionHistoryTest.FrameBackForward flaky on Windows.
BUG=48833 TEST=Vista Tests (dbg)(2) should become green Review URL: http://codereview.chromium.org/2956004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/session_history_uitest.cc')
-rw-r--r--chrome/browser/session_history_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
index cf854a3..a449437 100644
--- a/chrome/browser/session_history_uitest.cc
+++ b/chrome/browser/session_history_uitest.cc
@@ -141,7 +141,13 @@ TEST_F(SessionHistoryTest, BasicBackForward) {
}
// Test that back/forward works when navigating in subframes.
-TEST_F(SessionHistoryTest, FrameBackForward) {
+// Fails on Windows. See crbug.com/TODO
+#if defined(OS_WIN)
+#define MAYBE_FrameBackForward FLAKY_FrameBackForward
+#else
+#define MAYBE_FrameBackForward FrameBackForward
+#endif
+TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) {
scoped_refptr<HTTPTestServer> server =
HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());