summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 14:19:36 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 14:19:36 +0000
commit38421d697fbe858c26091ddf166933202009cf99 (patch)
tree186f14c59906870bb993f59f3d791794d7673079
parent1f1cadc47008fb097d3096405d8c5ec18b6ba489 (diff)
downloadchromium_src-38421d697fbe858c26091ddf166933202009cf99.zip
chromium_src-38421d697fbe858c26091ddf166933202009cf99.tar.gz
chromium_src-38421d697fbe858c26091ddf166933202009cf99.tar.bz2
Revert 59851 since we now avoid the problem with the testing webserver.
BUG=55380 TEST=green tree Review URL: http://codereview.chromium.org/3871002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63210 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/history/redirect_uitest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index 458c8e0..5df9999 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -56,8 +56,7 @@ TEST_F(RedirectTest, Server) {
}
// Tests a single client redirect.
-// Flaky: see crbug.com/55380
-TEST_F(RedirectTest, FLAKY_Client) {
+TEST_F(RedirectTest, Client) {
ASSERT_TRUE(test_server_.Start());
GURL final_url = test_server_.GetURL(std::string());