From 19656343a9e461346837edae7a0f1c21b80b4d55 Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Thu, 1 Dec 2011 18:27:05 +0000 Subject: SessionHistoryTest.FrameBackForward is probably no longer flaky. BUG=61619 Review URL: http://codereview.chromium.org/8770009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112488 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/session_history_uitest.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 5a597c4..7a6c027 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -146,15 +146,8 @@ TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) { EXPECT_EQ(L"bot3", GetTabTitle()); } -#if defined(OS_WIN) || defined(OS_MAC) -// 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. -TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) { +TEST_F(SessionHistoryTest, FrameBackForward) { ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. -- cgit v1.1