diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:19:05 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:19:05 +0000 |
| commit | 1f1cadc47008fb097d3096405d8c5ec18b6ba489 (patch) | |
| tree | b7ef07f629eb32d17fece42874c63d8b2fdbf117 /chrome/browser/session_history_uitest.cc | |
| parent | 6ae3d4909757757f27940369e1bdc67eebd52b87 (diff) | |
| download | chromium_src-1f1cadc47008fb097d3096405d8c5ec18b6ba489.zip chromium_src-1f1cadc47008fb097d3096405d8c5ec18b6ba489.tar.gz chromium_src-1f1cadc47008fb097d3096405d8c5ec18b6ba489.tar.bz2 | |
Revert 59218 since we now avoid the problem in the testing webserver that caused problems.
BUG=55380
TEST=waterfall says green
Review URL: http://codereview.chromium.org/3908003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/session_history_uitest.cc')
| -rw-r--r-- | chrome/browser/session_history_uitest.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index a30678a..278672a 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -80,13 +80,7 @@ class SessionHistoryTest : public UITest { net::TestServer test_server_; }; -#if defined(OS_WIN) || defined(OS_LINUX) -// http://crbug.com/55380 - NavigateToURL to making this flaky -#define MAYBE_BasicBackForward FLAKY_BasicBackForward -#else -#define MAYBE_BasicBackForward BasicBackForward -#endif -TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) { +TEST_F(SessionHistoryTest, BasicBackForward) { ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. @@ -319,13 +313,7 @@ TEST_F(SessionHistoryTest, DISABLED_CrossFrameFormBackForward) { // Test that back/forward entries are created for reference fragment // navigations. Bug 730379. -#if defined(OS_WIN) -// http://crbug.com/55380 - NavigateToURL to making this flaky -#define MAYBE_FragmentBackForward FLAKY_FragmentBackForward -#else -#define MAYBE_FragmentBackForward FragmentBackForward -#endif -TEST_F(SessionHistoryTest, MAYBE_FragmentBackForward) { +TEST_F(SessionHistoryTest, FragmentBackForward) { ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. |