diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/browser/session_history_uitest.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
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. |