summaryrefslogtreecommitdiffstats
path: root/net/socket/socks_client_socket.h
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/socks_client_socket.h
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/socks_client_socket.h')
-rw-r--r--net/socket/socks_client_socket.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index 1d2cb8d..ee0cd6a 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -18,7 +18,7 @@
#include "net/base/host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
-#include "net/socket/client_socket.h"
+#include "net/socket/stream_socket.h"
namespace net {
@@ -26,7 +26,7 @@ class ClientSocketHandle;
class BoundNetLog;
// The SOCKS client socket implementation
-class SOCKSClientSocket : public ClientSocket {
+class SOCKSClientSocket : public StreamSocket {
public:
// Takes ownership of the |transport_socket|, which should already be
// connected by the time Connect() is called.
@@ -37,15 +37,15 @@ class SOCKSClientSocket : public ClientSocket {
const HostResolver::RequestInfo& req_info,
HostResolver* host_resolver);
- // Deprecated constructor (http://crbug.com/37810) that takes a ClientSocket.
- SOCKSClientSocket(ClientSocket* transport_socket,
+ // Deprecated constructor (http://crbug.com/37810) that takes a StreamSocket.
+ SOCKSClientSocket(StreamSocket* transport_socket,
const HostResolver::RequestInfo& req_info,
HostResolver* host_resolver);
// On destruction Disconnect() is called.
virtual ~SOCKSClientSocket();
- // ClientSocket methods:
+ // StreamSocket methods:
// Does the SOCKS handshake and completes the protocol.
virtual int Connect(CompletionCallback* callback);