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 8825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8836 session->GetTransportSocketPool( | 8836 session->GetTransportSocketPool( |
8837 HttpNetworkSession::NORMAL_SOCKET_POOL), | 8837 HttpNetworkSession::NORMAL_SOCKET_POOL), |
8838 BoundNetLog())); | 8838 BoundNetLog())); |
8839 EXPECT_EQ(OK, callback.WaitForResult()); | 8839 EXPECT_EQ(OK, callback.WaitForResult()); |
8840 | 8840 |
8841 SSLConfig ssl_config; | 8841 SSLConfig ssl_config; |
8842 session->ssl_config_service()->GetSSLConfig(&ssl_config); | 8842 session->ssl_config_service()->GetSSLConfig(&ssl_config); |
8843 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); | 8843 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); |
8844 SSLClientSocketContext context; | 8844 SSLClientSocketContext context; |
8845 context.cert_verifier = session_deps_.cert_verifier.get(); | 8845 context.cert_verifier = session_deps_.cert_verifier.get(); |
| 8846 context.transport_security_state = |
| 8847 session_deps_.transport_security_state.get(); |
8846 ssl_connection->set_socket( | 8848 ssl_connection->set_socket( |
8847 session_deps_.socket_factory->CreateSSLClientSocket( | 8849 session_deps_.socket_factory->CreateSSLClientSocket( |
8848 connection.release(), | 8850 connection.release(), |
8849 HostPortPair(std::string(), 443), | 8851 HostPortPair(std::string(), 443), |
8850 ssl_config, | 8852 ssl_config, |
8851 context)); | 8853 context)); |
8852 EXPECT_EQ(ERR_IO_PENDING, | 8854 EXPECT_EQ(ERR_IO_PENDING, |
8853 ssl_connection->socket()->Connect(callback.callback())); | 8855 ssl_connection->socket()->Connect(callback.callback())); |
8854 EXPECT_EQ(OK, callback.WaitForResult()); | 8856 EXPECT_EQ(OK, callback.WaitForResult()); |
8855 | 8857 |
(...skipping 2545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
11401 EXPECT_EQ("hello!", response_data); | 11403 EXPECT_EQ("hello!", response_data); |
11402 EXPECT_FALSE( | 11404 EXPECT_FALSE( |
11403 session->spdy_session_pool()->HasSession(spdy_session_key_a)); | 11405 session->spdy_session_pool()->HasSession(spdy_session_key_a)); |
11404 EXPECT_FALSE( | 11406 EXPECT_FALSE( |
11405 session->spdy_session_pool()->HasSession(spdy_session_key_b)); | 11407 session->spdy_session_pool()->HasSession(spdy_session_key_b)); |
11406 | 11408 |
11407 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); | 11409 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
11408 } | 11410 } |
11409 | 11411 |
11410 } // namespace net | 11412 } // namespace net |
OLD | NEW |