OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/http/http_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
6 | 6 |
7 #include <math.h> // ceil | 7 #include <math.h> // ceil |
8 #include <stdarg.h> | 8 #include <stdarg.h> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 8799 matching lines...) Loading... |
8810 session->GetTransportSocketPool( | 8810 session->GetTransportSocketPool( |
8811 HttpNetworkSession::NORMAL_SOCKET_POOL), | 8811 HttpNetworkSession::NORMAL_SOCKET_POOL), |
8812 BoundNetLog())); | 8812 BoundNetLog())); |
8813 EXPECT_EQ(OK, callback.WaitForResult()); | 8813 EXPECT_EQ(OK, callback.WaitForResult()); |
8814 | 8814 |
8815 SSLConfig ssl_config; | 8815 SSLConfig ssl_config; |
8816 session->ssl_config_service()->GetSSLConfig(&ssl_config); | 8816 session->ssl_config_service()->GetSSLConfig(&ssl_config); |
8817 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); | 8817 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); |
8818 SSLClientSocketContext context; | 8818 SSLClientSocketContext context; |
8819 context.cert_verifier = session_deps_.cert_verifier.get(); | 8819 context.cert_verifier = session_deps_.cert_verifier.get(); |
| 8820 context.transport_security_state = |
| 8821 session_deps_.transport_security_state.get(); |
8820 ssl_connection->set_socket( | 8822 ssl_connection->set_socket( |
8821 session_deps_.socket_factory->CreateSSLClientSocket( | 8823 session_deps_.socket_factory->CreateSSLClientSocket( |
8822 connection.release(), | 8824 connection.release(), |
8823 HostPortPair(std::string(), 443), | 8825 HostPortPair(std::string(), 443), |
8824 ssl_config, | 8826 ssl_config, |
8825 context)); | 8827 context)); |
8826 EXPECT_EQ(ERR_IO_PENDING, | 8828 EXPECT_EQ(ERR_IO_PENDING, |
8827 ssl_connection->socket()->Connect(callback.callback())); | 8829 ssl_connection->socket()->Connect(callback.callback())); |
8828 EXPECT_EQ(OK, callback.WaitForResult()); | 8830 EXPECT_EQ(OK, callback.WaitForResult()); |
8829 | 8831 |
(...skipping 2515 matching lines...) Loading... |
11345 EXPECT_EQ("hello!", response_data); | 11347 EXPECT_EQ("hello!", response_data); |
11346 EXPECT_FALSE( | 11348 EXPECT_FALSE( |
11347 session->spdy_session_pool()->HasSession(spdy_session_key_a)); | 11349 session->spdy_session_pool()->HasSession(spdy_session_key_a)); |
11348 EXPECT_FALSE( | 11350 EXPECT_FALSE( |
11349 session->spdy_session_pool()->HasSession(spdy_session_key_b)); | 11351 session->spdy_session_pool()->HasSession(spdy_session_key_b)); |
11350 | 11352 |
11351 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); | 11353 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
11352 } | 11354 } |
11353 | 11355 |
11354 } // namespace net | 11356 } // namespace net |
OLD | NEW |