| Index: net/http/http_network_transaction_unittest.cc
|
| diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
|
| index 6be19d7e4081579c862a5fc9fd6198bc2033ac46..7f8980882147dbaf6006510efc49b01a453de3c9 100644
|
| --- a/net/http/http_network_transaction_unittest.cc
|
| +++ b/net/http/http_network_transaction_unittest.cc
|
| @@ -1494,12 +1494,7 @@ void HttpNetworkTransactionTest::PreconnectErrorResendRequestTest(
|
| session_deps_.socket_factory->AddSocketDataProvider(&data2);
|
|
|
| // Preconnect a socket.
|
| - SSLConfig ssl_config;
|
| - session->ssl_config_service()->GetSSLConfig(&ssl_config);
|
| - session->GetAlpnProtos(&ssl_config.alpn_protos);
|
| - session->GetNpnProtos(&ssl_config.npn_protos);
|
| - session->http_stream_factory()->PreconnectStreams(1, request, ssl_config,
|
| - ssl_config);
|
| + session->http_stream_factory()->PreconnectStreams(1, request);
|
| // Wait for the preconnect to complete.
|
| // TODO(davidben): Some way to wait for an idle socket count might be handy.
|
| base::RunLoop().RunUntilIdle();
|
| @@ -14680,9 +14675,7 @@ class FakeStreamFactory : public HttpStreamFactory {
|
| }
|
|
|
| void PreconnectStreams(int num_streams,
|
| - const HttpRequestInfo& info,
|
| - const SSLConfig& server_ssl_config,
|
| - const SSLConfig& proxy_ssl_config) override {
|
| + const HttpRequestInfo& info) override {
|
| ADD_FAILURE();
|
| }
|
|
|
| @@ -15091,10 +15084,7 @@ TEST_P(HttpNetworkTransactionTest, CloseSSLSocketOnIdleForHttpRequest2) {
|
| // Preconnect an SSL socket. A preconnect is needed because connect jobs are
|
| // cancelled when a normal transaction is cancelled.
|
| HttpStreamFactory* http_stream_factory = session->http_stream_factory();
|
| - SSLConfig ssl_config;
|
| - session->ssl_config_service()->GetSSLConfig(&ssl_config);
|
| - http_stream_factory->PreconnectStreams(1, ssl_request, ssl_config,
|
| - ssl_config);
|
| + http_stream_factory->PreconnectStreams(1, ssl_request);
|
| EXPECT_EQ(0, GetIdleSocketCountInSSLSocketPool(session.get()));
|
|
|
| // Start the HTTP request. Pool should stall.
|
|
|