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

2 files changed, 4 insertions, 23 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.
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index a8a13e6..4e48d5a 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -454,13 +454,7 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) {
 
 // Tests that a duplicate history entry is not created when we restore a page
 // to an existing SiteInstance.  (Bug 1230446)
-#if defined(OS_WIN)
-// http://crbug.com/55380 - NavigateToURL to making this flaky
-#define MAYBE_RestoreWithExistingSiteInstance FLAKY_RestoreWithExistingSiteInstance
-#else
-#define MAYBE_RestoreWithExistingSiteInstance RestoreWithExistingSiteInstance
-#endif
-TEST_F(TabRestoreUITest, MAYBE_RestoreWithExistingSiteInstance) {
+TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
@@ -507,8 +501,7 @@ TEST_F(TabRestoreUITest, MAYBE_RestoreWithExistingSiteInstance) {
 // Tests that the SiteInstances used for entries in a restored tab's history
 // are given appropriate max page IDs, even if the renderer for the entry
 // already exists.  (Bug 1204135)
-// http://crbug.com/55380 - NavigateToURL to making this flaky on all platforms
-TEST_F(TabRestoreUITest, FLAKY_RestoreCrossSiteWithExistingSiteInstance) {
+TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());