summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
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