summaryrefslogtreecommitdiffstats
path: root/net/socket/socket_test_util.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 00:08:10 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 00:08:10 +0000
commit3268023f1382463baf9ac9537664b90ab4ae6883 (patch)
tree286c919264367f10ff289f0828ba2a713eaf523e /net/socket/socket_test_util.cc
parent44da8217868a044e283062254c0bf02f0c66f0a1 (diff)
downloadchromium_src-3268023f1382463baf9ac9537664b90ab4ae6883.zip
chromium_src-3268023f1382463baf9ac9537664b90ab4ae6883.tar.gz
chromium_src-3268023f1382463baf9ac9537664b90ab4ae6883.tar.bz2
Rename ClientSocket to StreamSocket.
BUG=80895 TEST=Compiles Review URL: http://codereview.chromium.org/6930014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
-rw-r--r--net/socket/socket_test_util.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 577c7d2..a6d33d5 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -588,7 +588,7 @@ MockSSLClientSocket* MockClientSocketFactory::GetMockSSLClientSocket(
return ssl_client_sockets_[index];
}
-ClientSocket* MockClientSocketFactory::CreateTransportClientSocket(
+StreamSocket* MockClientSocketFactory::CreateTransportClientSocket(
const AddressList& addresses,
net::NetLog* net_log,
const NetLog::Source& source) {
@@ -1180,7 +1180,7 @@ void ClientSocketPoolTest::ReleaseAllConnections(KeepAlive keep_alive) {
}
MockTransportClientSocketPool::MockConnectJob::MockConnectJob(
- ClientSocket* socket,
+ StreamSocket* socket,
ClientSocketHandle* handle,
CompletionCallback* callback)
: socket_(socket),
@@ -1249,7 +1249,7 @@ int MockTransportClientSocketPool::RequestSocket(const std::string& group_name,
ClientSocketHandle* handle,
CompletionCallback* callback,
const BoundNetLog& net_log) {
- ClientSocket* socket = client_socket_factory_->CreateTransportClientSocket(
+ StreamSocket* socket = client_socket_factory_->CreateTransportClientSocket(
AddressList(), net_log.net_log(), net::NetLog::Source());
MockConnectJob* job = new MockConnectJob(socket, handle, callback);
job_list_.push_back(job);
@@ -1269,7 +1269,7 @@ void MockTransportClientSocketPool::CancelRequest(const std::string& group_name,
}
void MockTransportClientSocketPool::ReleaseSocket(const std::string& group_name,
- ClientSocket* socket, int id) {
+ StreamSocket* socket, int id) {
EXPECT_EQ(1, id);
release_count_++;
delete socket;
@@ -1300,7 +1300,7 @@ MockSSLClientSocket* DeterministicMockClientSocketFactory::
return ssl_client_sockets_[index];
}
-ClientSocket* DeterministicMockClientSocketFactory::CreateTransportClientSocket(
+StreamSocket* DeterministicMockClientSocketFactory::CreateTransportClientSocket(
const AddressList& addresses,
net::NetLog* net_log,
const net::NetLog::Source& source) {
@@ -1362,7 +1362,7 @@ void MockSOCKSClientSocketPool::CancelRequest(
}
void MockSOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
- ClientSocket* socket, int id) {
+ StreamSocket* socket, int id) {
return transport_pool_->ReleaseSocket(group_name, socket, id);
}