| Index: net/url_request/url_request_unittest.cc
|
| ===================================================================
|
| --- net/url_request/url_request_unittest.cc (revision 183024)
|
| +++ net/url_request/url_request_unittest.cc (working copy)
|
| @@ -2131,9 +2131,7 @@
|
|
|
| // This is the same as the previous test, but checks that the network delegate
|
| // registers the error.
|
| -// This test was disabled because it made chrome_frame_net_tests hang
|
| -// (see bug 102991).
|
| -TEST_F(URLRequestTestHTTP, DISABLED_NetworkDelegateTunnelConnectionFailed) {
|
| +TEST_F(URLRequestTestHTTP, NetworkDelegateTunnelConnectionFailed) {
|
| ASSERT_TRUE(test_server_.Start());
|
|
|
| TestNetworkDelegate network_delegate; // Must outlive URLRequest.
|
| @@ -2942,9 +2940,7 @@
|
| }
|
| }
|
|
|
| -// This test was disabled because it made chrome_frame_net_tests hang
|
| -// (see bug 102991).
|
| -TEST_F(URLRequestTestHTTP, DISABLED_HTTPSToHTTPRedirectNoRefererTest) {
|
| +TEST_F(URLRequestTestHTTP, HTTPSToHTTPRedirectNoRefererTest) {
|
| ASSERT_TRUE(test_server_.Start());
|
|
|
| TestServer https_test_server(
|
| @@ -4141,9 +4137,7 @@
|
| TestURLRequestContext default_context_;
|
| };
|
|
|
| -// This test was disabled because it made chrome_frame_net_tests hang
|
| -// (see bug 102991).
|
| -TEST_F(HTTPSRequestTest, DISABLED_HTTPSGetTest) {
|
| +TEST_F(HTTPSRequestTest, HTTPSGetTest) {
|
| TestServer test_server(TestServer::TYPE_HTTPS,
|
| TestServer::kLocalhost,
|
| base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
|
|
|