OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_proxy_client_socket_pool.h" | 5 #include "net/http/http_proxy_client_socket_pool.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 } | 133 } |
134 | 134 |
135 HttpNetworkSession* CreateNetworkSession() { | 135 HttpNetworkSession* CreateNetworkSession() { |
136 HttpNetworkSession::Params params; | 136 HttpNetworkSession::Params params; |
137 params.host_resolver = &host_resolver_; | 137 params.host_resolver = &host_resolver_; |
138 params.cert_verifier = &cert_verifier_; | 138 params.cert_verifier = &cert_verifier_; |
139 params.proxy_service = proxy_service_.get(); | 139 params.proxy_service = proxy_service_.get(); |
140 params.client_socket_factory = &socket_factory_; | 140 params.client_socket_factory = &socket_factory_; |
141 params.ssl_config_service = ssl_config_service_; | 141 params.ssl_config_service = ssl_config_service_; |
142 params.http_auth_handler_factory = http_auth_handler_factory_.get(); | 142 params.http_auth_handler_factory = http_auth_handler_factory_.get(); |
| 143 params.http_server_properties = NULL; |
143 return new HttpNetworkSession(params); | 144 return new HttpNetworkSession(params); |
144 } | 145 } |
145 | 146 |
146 MockClientSocketFactory socket_factory_; | 147 MockClientSocketFactory socket_factory_; |
147 MockCachingHostResolver host_resolver_; | 148 MockCachingHostResolver host_resolver_; |
148 CertVerifier cert_verifier_; | 149 CertVerifier cert_verifier_; |
149 const scoped_ptr<ProxyService> proxy_service_; | 150 const scoped_ptr<ProxyService> proxy_service_; |
150 const scoped_refptr<SSLConfigService> ssl_config_service_; | 151 const scoped_refptr<SSLConfigService> ssl_config_service_; |
151 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; | 152 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; |
152 const scoped_refptr<HttpNetworkSession> session_; | 153 const scoped_refptr<HttpNetworkSession> session_; |
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 EXPECT_TRUE(session_->spdy_session_pool()->HasSession(test_hosts[2].pair)); | 734 EXPECT_TRUE(session_->spdy_session_pool()->HasSession(test_hosts[2].pair)); |
734 | 735 |
735 session_->spdy_session_pool()->CloseAllSessions(); | 736 session_->spdy_session_pool()->CloseAllSessions(); |
736 } | 737 } |
737 | 738 |
738 // It would be nice to also test the timeouts in SSLClientSocketPool. | 739 // It would be nice to also test the timeouts in SSLClientSocketPool. |
739 | 740 |
740 } // namespace | 741 } // namespace |
741 | 742 |
742 } // namespace net | 743 } // namespace net |
OLD | NEW |