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

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

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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.h ('k') | net/socket/ssl_client_socket_pool_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/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "net/base/host_port_pair.h"
12 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
13 #include "net/base/host_port_pair.h"
14 #include "net/base/ssl_cert_request_info.h"
15 #include "net/http/http_proxy_client_socket.h" 14 #include "net/http/http_proxy_client_socket.h"
16 #include "net/http/http_proxy_client_socket_pool.h" 15 #include "net/http/http_proxy_client_socket_pool.h"
17 #include "net/socket/client_socket_factory.h" 16 #include "net/socket/client_socket_factory.h"
18 #include "net/socket/client_socket_handle.h" 17 #include "net/socket/client_socket_handle.h"
19 #include "net/socket/socks_client_socket_pool.h" 18 #include "net/socket/socks_client_socket_pool.h"
20 #include "net/socket/ssl_client_socket.h" 19 #include "net/socket/ssl_client_socket.h"
21 #include "net/socket/transport_client_socket_pool.h" 20 #include "net/socket/transport_client_socket_pool.h"
21 #include "net/ssl/ssl_cert_request_info.h"
22 22
23 namespace net { 23 namespace net {
24 24
25 SSLSocketParams::SSLSocketParams( 25 SSLSocketParams::SSLSocketParams(
26 const scoped_refptr<TransportSocketParams>& transport_params, 26 const scoped_refptr<TransportSocketParams>& transport_params,
27 const scoped_refptr<SOCKSSocketParams>& socks_params, 27 const scoped_refptr<SOCKSSocketParams>& socks_params,
28 const scoped_refptr<HttpProxySocketParams>& http_proxy_params, 28 const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
29 ProxyServer::Scheme proxy, 29 ProxyServer::Scheme proxy,
30 const HostPortPair& host_and_port, 30 const HostPortPair& host_and_port,
31 const SSLConfig& ssl_config, 31 const SSLConfig& ssl_config,
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 FlushWithError(ERR_NETWORK_CHANGED); 622 FlushWithError(ERR_NETWORK_CHANGED);
623 } 623 }
624 624
625 bool SSLClientSocketPool::CloseOneIdleConnection() { 625 bool SSLClientSocketPool::CloseOneIdleConnection() {
626 if (base_.CloseOneIdleSocket()) 626 if (base_.CloseOneIdleSocket())
627 return true; 627 return true;
628 return base_.CloseOneIdleConnectionInLayeredPool(); 628 return base_.CloseOneIdleConnectionInLayeredPool();
629 } 629 }
630 630
631 } // namespace net 631 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698