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

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

Issue 11415219: Move a number of static variables SPDY to HttpNetworkSession::Params. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix flip_in_mem_edsm_server Created 8 years 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 | Annotate | Revision Log
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/string_util.h" 9 #include "base/string_util.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 HttpNetworkSession* CreateNetworkSession() { 137 HttpNetworkSession* CreateNetworkSession() {
138 HttpNetworkSession::Params params; 138 HttpNetworkSession::Params params;
139 params.host_resolver = &host_resolver_; 139 params.host_resolver = &host_resolver_;
140 params.cert_verifier = cert_verifier_.get(); 140 params.cert_verifier = cert_verifier_.get();
141 params.proxy_service = proxy_service_.get(); 141 params.proxy_service = proxy_service_.get();
142 params.client_socket_factory = &socket_factory_; 142 params.client_socket_factory = &socket_factory_;
143 params.ssl_config_service = ssl_config_service_; 143 params.ssl_config_service = ssl_config_service_;
144 params.http_auth_handler_factory = http_auth_handler_factory_.get(); 144 params.http_auth_handler_factory = http_auth_handler_factory_.get();
145 params.http_server_properties = &http_server_properties_; 145 params.http_server_properties = &http_server_properties_;
146 params.enable_spdy_compression = false;
146 return new HttpNetworkSession(params); 147 return new HttpNetworkSession(params);
147 } 148 }
148 149
149 void TestIPPoolingDisabled(SSLSocketDataProvider* ssl); 150 void TestIPPoolingDisabled(SSLSocketDataProvider* ssl);
150 151
151 MockClientSocketFactory socket_factory_; 152 MockClientSocketFactory socket_factory_;
152 MockCachingHostResolver host_resolver_; 153 MockCachingHostResolver host_resolver_;
153 scoped_ptr<CertVerifier> cert_verifier_; 154 scoped_ptr<CertVerifier> cert_verifier_;
154 const scoped_ptr<ProxyService> proxy_service_; 155 const scoped_ptr<ProxyService> proxy_service_;
155 const scoped_refptr<SSLConfigService> ssl_config_service_; 156 const scoped_refptr<SSLConfigService> ssl_config_service_;
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 ssl.channel_id_sent = true; 835 ssl.channel_id_sent = true;
835 ssl.SetNextProto(kProtoSPDY2); 836 ssl.SetNextProto(kProtoSPDY2);
836 TestIPPoolingDisabled(&ssl); 837 TestIPPoolingDisabled(&ssl);
837 } 838 }
838 839
839 // It would be nice to also test the timeouts in SSLClientSocketPool. 840 // It would be nice to also test the timeouts in SSLClientSocketPool.
840 841
841 } // namespace 842 } // namespace
842 843
843 } // namespace net 844 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket_pool_spdy3_unittest.cc ('k') | net/spdy/buffered_spdy_framer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698