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

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

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 AuthCredentials(kFoo, kBar), 176 AuthCredentials(kFoo, kBar),
177 "/"); 177 "/");
178 } 178 }
179 179
180 HttpNetworkSession* CreateNetworkSession() { 180 HttpNetworkSession* CreateNetworkSession() {
181 HttpNetworkSession::Params params; 181 HttpNetworkSession::Params params;
182 params.host_resolver = &host_resolver_; 182 params.host_resolver = &host_resolver_;
183 params.cert_verifier = cert_verifier_.get(); 183 params.cert_verifier = cert_verifier_.get();
184 params.proxy_service = proxy_service_.get(); 184 params.proxy_service = proxy_service_.get();
185 params.client_socket_factory = &socket_factory_; 185 params.client_socket_factory = &socket_factory_;
186 params.ssl_config_service = ssl_config_service_; 186 params.ssl_config_service = ssl_config_service_.get();
187 params.http_auth_handler_factory = http_auth_handler_factory_.get(); 187 params.http_auth_handler_factory = http_auth_handler_factory_.get();
188 params.http_server_properties = &http_server_properties_; 188 params.http_server_properties = &http_server_properties_;
189 params.enable_spdy_compression = false; 189 params.enable_spdy_compression = false;
190 return new HttpNetworkSession(params); 190 return new HttpNetworkSession(params);
191 } 191 }
192 192
193 void TestIPPoolingDisabled(SSLSocketDataProvider* ssl); 193 void TestIPPoolingDisabled(SSLSocketDataProvider* ssl);
194 194
195 MockClientSocketFactory socket_factory_; 195 MockClientSocketFactory socket_factory_;
196 MockCachingHostResolver host_resolver_; 196 MockCachingHostResolver host_resolver_;
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 ssl.channel_id_sent = true; 894 ssl.channel_id_sent = true;
895 ssl.SetNextProto(kProtoSPDY2); 895 ssl.SetNextProto(kProtoSPDY2);
896 TestIPPoolingDisabled(&ssl); 896 TestIPPoolingDisabled(&ssl);
897 } 897 }
898 898
899 // It would be nice to also test the timeouts in SSLClientSocketPool. 899 // It would be nice to also test the timeouts in SSLClientSocketPool.
900 900
901 } // namespace 901 } // namespace
902 902
903 } // namespace net 903 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698