diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 15:22:28 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 15:22:28 +0000 |
commit | ab73904ffa1b236905a4f1253dd03e02dd9e8695 (patch) | |
tree | 280c13fdd850ed27e964df6f25cc7b6f16072a3b /net/socket/client_socket_pool_manager.h | |
parent | 53900d0715c882d9b8ae8281a17272143fd77143 (diff) | |
download | chromium_src-ab73904ffa1b236905a4f1253dd03e02dd9e8695.zip chromium_src-ab73904ffa1b236905a4f1253dd03e02dd9e8695.tar.gz chromium_src-ab73904ffa1b236905a4f1253dd03e02dd9e8695.tar.bz2 |
Rename a number of classes previously labeled "TCP" to "Transport" in
preparation for non-TCP transports. This helps because the alternative
is to either use non-TCP protocols (like SCTP) in classes which are called
"TCPClientSocketPool", or to clone the code as "SCTPClientSocketPool", both
of which are less than ideal.
For now, we're just testing transports, so the TransportSocketPool classes
will determine a single type of transport and just use them. In the future
we'll likely need to figure out how to deal with runtime selection of
transports, and probably support use of multiple transports either within
the same pools or within subpools. But that is for the future.
Note that the histograms have some "tcp" references to them. I didn't change
these to "transport" yet, because it will effect existing histograms.
Renames include:
classes:
TCPClientSocketPool -> TransportClientSocketPool
MockTCPClientSocketPool -> MockTransportClientSocketPool
TCPSocketParams -> TransportSocketParams
methods (not the exhaustive list):
CreateTCPClientSocket() -> CreateTransportClientSocket()
DoTCPConnect() -> DoTransportConnect()
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6804028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_manager.h')
-rw-r--r-- | net/socket/client_socket_pool_manager.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h index f10b012..ca580e4 100644 --- a/net/socket/client_socket_pool_manager.h +++ b/net/socket/client_socket_pool_manager.h @@ -43,7 +43,7 @@ class SOCKSClientSocketPool; class SSLClientSocketPool; class SSLConfigService; class SSLHostInfoFactory; -class TCPClientSocketPool; +class TransportClientSocketPool; struct HttpRequestInfo; struct SSLConfig; @@ -83,7 +83,9 @@ class ClientSocketPoolManager : public base::NonThreadSafe, void FlushSocketPools(); void CloseIdleSockets(); - TCPClientSocketPool* tcp_socket_pool() { return tcp_socket_pool_.get(); } + TransportClientSocketPool* transport_socket_pool() { + return transport_socket_pool_.get(); + } SSLClientSocketPool* ssl_socket_pool() { return ssl_socket_pool_.get(); } @@ -153,8 +155,8 @@ class ClientSocketPoolManager : public base::NonThreadSafe, private: friend class HttpNetworkSessionPeer; - typedef internal::OwnedPoolMap<HostPortPair, TCPClientSocketPool*> - TCPSocketPoolMap; + typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> + TransportSocketPoolMap; typedef internal::OwnedPoolMap<HostPortPair, SOCKSClientSocketPool*> SOCKSSocketPoolMap; typedef internal::OwnedPoolMap<HostPortPair, HttpProxyClientSocketPool*> @@ -174,23 +176,23 @@ class ClientSocketPoolManager : public base::NonThreadSafe, // Note: this ordering is important. - ClientSocketPoolHistograms tcp_pool_histograms_; - scoped_ptr<TCPClientSocketPool> tcp_socket_pool_; + ClientSocketPoolHistograms transport_pool_histograms_; + scoped_ptr<TransportClientSocketPool> transport_socket_pool_; ClientSocketPoolHistograms ssl_pool_histograms_; scoped_ptr<SSLClientSocketPool> ssl_socket_pool_; - ClientSocketPoolHistograms tcp_for_socks_pool_histograms_; - TCPSocketPoolMap tcp_socket_pools_for_socks_proxies_; + ClientSocketPoolHistograms transport_for_socks_pool_histograms_; + TransportSocketPoolMap transport_socket_pools_for_socks_proxies_; ClientSocketPoolHistograms socks_pool_histograms_; SOCKSSocketPoolMap socks_socket_pools_; - ClientSocketPoolHistograms tcp_for_http_proxy_pool_histograms_; - TCPSocketPoolMap tcp_socket_pools_for_http_proxies_; + ClientSocketPoolHistograms transport_for_http_proxy_pool_histograms_; + TransportSocketPoolMap transport_socket_pools_for_http_proxies_; - ClientSocketPoolHistograms tcp_for_https_proxy_pool_histograms_; - TCPSocketPoolMap tcp_socket_pools_for_https_proxies_; + ClientSocketPoolHistograms transport_for_https_proxy_pool_histograms_; + TransportSocketPoolMap transport_socket_pools_for_https_proxies_; ClientSocketPoolHistograms ssl_for_https_proxy_pool_histograms_; SSLSocketPoolMap ssl_socket_pools_for_https_proxies_; |