Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 1298253002: Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed too much, back up a bit Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_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/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 void TestIPPoolingDisabled(SSLSocketDataProvider* ssl); 178 void TestIPPoolingDisabled(SSLSocketDataProvider* ssl);
179 179
180 MockClientSocketFactory socket_factory_; 180 MockClientSocketFactory socket_factory_;
181 MockCachingHostResolver host_resolver_; 181 MockCachingHostResolver host_resolver_;
182 scoped_ptr<CertVerifier> cert_verifier_; 182 scoped_ptr<CertVerifier> cert_verifier_;
183 scoped_ptr<TransportSecurityState> transport_security_state_; 183 scoped_ptr<TransportSecurityState> transport_security_state_;
184 const scoped_ptr<ProxyService> proxy_service_; 184 const scoped_ptr<ProxyService> proxy_service_;
185 const scoped_refptr<SSLConfigService> ssl_config_service_; 185 const scoped_refptr<SSLConfigService> ssl_config_service_;
186 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; 186 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
187 HttpServerPropertiesImpl http_server_properties_; 187 HttpServerPropertiesImpl http_server_properties_;
188 const scoped_refptr<HttpNetworkSession> session_; 188 const scoped_ptr<HttpNetworkSession> session_;
189 189
190 scoped_refptr<TransportSocketParams> direct_transport_socket_params_; 190 scoped_refptr<TransportSocketParams> direct_transport_socket_params_;
191 MockTransportClientSocketPool transport_socket_pool_; 191 MockTransportClientSocketPool transport_socket_pool_;
192 192
193 scoped_refptr<TransportSocketParams> proxy_transport_socket_params_; 193 scoped_refptr<TransportSocketParams> proxy_transport_socket_params_;
194 194
195 scoped_refptr<SOCKSSocketParams> socks_socket_params_; 195 scoped_refptr<SOCKSSocketParams> socks_socket_params_;
196 MockSOCKSClientSocketPool socks_socket_pool_; 196 MockSOCKSClientSocketPool socks_socket_pool_;
197 197
198 scoped_refptr<HttpProxySocketParams> http_proxy_socket_params_; 198 scoped_refptr<HttpProxySocketParams> http_proxy_socket_params_;
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 ssl.channel_id_sent = true; 912 ssl.channel_id_sent = true;
913 ssl.SetNextProto(GetParam()); 913 ssl.SetNextProto(GetParam());
914 TestIPPoolingDisabled(&ssl); 914 TestIPPoolingDisabled(&ssl);
915 } 915 }
916 916
917 // It would be nice to also test the timeouts in SSLClientSocketPool. 917 // It would be nice to also test the timeouts in SSLClientSocketPool.
918 918
919 } // namespace 919 } // namespace
920 920
921 } // namespace net 921 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698