| Index: chrome/browser/session_history_uitest.cc
|
| diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
|
| index 36d302b9e9a126956eac206119dabfc36221eae2..1553b1def4b79046953cb282cf3a214e174924ac 100644
|
| --- a/chrome/browser/session_history_uitest.cc
|
| +++ b/chrome/browser/session_history_uitest.cc
|
| @@ -144,9 +144,15 @@ TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) {
|
| EXPECT_EQ(L"bot3", GetTabTitle());
|
| }
|
|
|
| +#if defined(OS_WIN)
|
| +// See http://crbug.com/61619
|
| +#define MAYBE_FrameBackForward FLAKY_FrameBackForward
|
| +#else
|
| +#define MAYBE_FrameBackForward FrameBackForward
|
| +#endif
|
| +
|
| // Test that back/forward works when navigating in subframes.
|
| -// Flaky, http://crbug.com/61619 and http://crbug.com/70883.
|
| -TEST_F(SessionHistoryTest, FLAKY_FrameBackForward) {
|
| +TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) {
|
| ASSERT_TRUE(test_server_.Start());
|
|
|
| // about:blank should be loaded first.
|
|
|