summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 10:47:47 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 10:47:47 +0000
commit8eb127e07794373951ee9935e73d06b35082a9b0 (patch)
tree68bf19beee18dabcfca87764443b5302f20f3a81 /net/url_request
parentfde269d9e7b0382de1796b416b72ba34a47900aa (diff)
downloadchromium_src-8eb127e07794373951ee9935e73d06b35082a9b0.zip
chromium_src-8eb127e07794373951ee9935e73d06b35082a9b0.tar.gz
chromium_src-8eb127e07794373951ee9935e73d06b35082a9b0.tar.bz2
Introduce logging to console and re-enable URLRequestTestHTTP.ProxyTunnelRedirectTest
BUG=96594 TEST=no Review URL: http://codereview.chromium.org/7901014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index dd06230..44f6560 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -266,13 +266,7 @@ class URLRequestTestHTTP : public URLRequestTest {
// issuing a CONNECT request with the magic host name "www.redirect.com".
// The HTTPTestServer will return a 302 response, which we should not
// follow.
-// See http://crbug.com/96594 for flakiness info.
-#if defined(TOOLKIT_VIEWS) && defined(DEBUG)
-#define MAYBE_ProxyTunnelRedirectTest FLAKY_ProxyTunnelRedirectTest
-#else
-#define MAYBE_ProxyTunnelRedirectTest ProxyTunnelRedirectTest
-#endif
-TEST_F(URLRequestTestHTTP, MAYBE_ProxyTunnelRedirectTest) {
+TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) {
ASSERT_TRUE(test_server_.Start());
TestNetworkDelegate network_delegate; // must outlive URLRequest