Index: net/socket/ssl_client_socket_pool_unittest.cc |
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc |
index 14b066239cc9c3b4cfed212a6125339b214654cc..104ad918b571b241afb7b0efd32e5274a0bac44f 100644 |
--- a/net/socket/ssl_client_socket_pool_unittest.cc |
+++ b/net/socket/ssl_client_socket_pool_unittest.cc |
@@ -22,6 +22,7 @@ |
#include "net/http/http_request_headers.h" |
#include "net/http/http_response_headers.h" |
#include "net/http/http_server_properties_impl.h" |
+#include "net/http/transport_security_state.h" |
#include "net/proxy/proxy_service.h" |
#include "net/socket/client_socket_handle.h" |
#include "net/socket/client_socket_pool_histograms.h" |
@@ -192,6 +193,7 @@ class SSLClientSocketPoolTest |
http_server_properties_.GetWeakPtr(); |
params.enable_spdy_compression = false; |
params.spdy_default_protocol = GetParam(); |
+ params.transport_security_state = new TransportSecurityState(); |
Ryan Sleevi
2014/08/19 05:20:28
Did you mean to delete this?
Ryan Hamilton
2014/08/19 13:50:19
Yup. Check out line 187:
params.transport_securi
|
return new HttpNetworkSession(params); |
} |
@@ -1257,8 +1259,7 @@ TEST_P(SSLClientSocketPoolTest, NeedProxyAuth) { |
EXPECT_FALSE(tunnel_handle->socket()->IsConnected()); |
} |
-// TODO(rch): re-enable this. |
-TEST_P(SSLClientSocketPoolTest, DISABLED_IPPooling) { |
+TEST_P(SSLClientSocketPoolTest, IPPooling) { |
const int kTestPort = 80; |
struct TestHosts { |
std::string name; |