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 /jingle | |
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 'jingle')
4 files changed, 6 insertions, 7 deletions
diff --git a/jingle/notifier/base/chrome_async_socket.cc b/jingle/notifier/base/chrome_async_socket.cc index f3a5a77..61adadd 100644 --- a/jingle/notifier/base/chrome_async_socket.cc +++ b/jingle/notifier/base/chrome_async_socket.cc @@ -147,9 +147,8 @@ bool ChromeAsyncSocket::Connect(const talk_base::SocketAddress& address) { net::AddressList address_list = SocketAddressToAddressList(address); transport_socket_.reset( - client_socket_factory_->CreateTCPClientSocket(address_list, - bound_net_log_.net_log(), - net::NetLog::Source())); + client_socket_factory_->CreateTransportClientSocket( + address_list, bound_net_log_.net_log(), net::NetLog::Source())); int status = transport_socket_->Connect(&connect_callback_); if (status != net::ERR_IO_PENDING) { // We defer execution of ProcessConnectDone instead of calling it diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc index 032f69f..72e9db6 100644 --- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc +++ b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc @@ -87,7 +87,7 @@ class FakeSSLClientSocketTest : public testing::Test { virtual ~FakeSSLClientSocketTest() {} net::ClientSocket* MakeClientSocket() { - return mock_client_socket_factory_.CreateTCPClientSocket( + return mock_client_socket_factory_.CreateTransportClientSocket( net::AddressList(), &capturing_net_log_, net::NetLog::Source()); } diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc index 8515f80..a4c4835 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.cc +++ b/jingle/notifier/base/xmpp_client_socket_factory.cc @@ -19,12 +19,12 @@ XmppClientSocketFactory::XmppClientSocketFactory( XmppClientSocketFactory::~XmppClientSocketFactory() {} -net::ClientSocket* XmppClientSocketFactory::CreateTCPClientSocket( +net::ClientSocket* XmppClientSocketFactory::CreateTransportClientSocket( const net::AddressList& addresses, net::NetLog* net_log, const net::NetLog::Source& source) { net::ClientSocket* transport_socket = - client_socket_factory_->CreateTCPClientSocket( + client_socket_factory_->CreateTransportClientSocket( addresses, net_log, source); return (use_fake_ssl_client_socket_ ? new FakeSSLClientSocket(transport_socket) : transport_socket); diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h index 48c683d..291cadf 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.h +++ b/jingle/notifier/base/xmpp_client_socket_factory.h @@ -27,7 +27,7 @@ class XmppClientSocketFactory : public net::ClientSocketFactory { virtual ~XmppClientSocketFactory(); // net::ClientSocketFactory implementation. - virtual net::ClientSocket* CreateTCPClientSocket( + virtual net::ClientSocket* CreateTransportClientSocket( const net::AddressList& addresses, net::NetLog* net_log, const net::NetLog::Source& source); virtual net::SSLClientSocket* CreateSSLClientSocket( |