diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 00:08:10 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 00:08:10 +0000 |
| commit | 3268023f1382463baf9ac9537664b90ab4ae6883 (patch) | |
| tree | 286c919264367f10ff289f0828ba2a713eaf523e /net/socket_stream | |
| parent | 44da8217868a044e283062254c0bf02f0c66f0a1 (diff) | |
| download | chromium_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_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 2 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream.h | 2 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream_unittest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index cd49822..d440664 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -776,7 +776,7 @@ int SocketStream::DoSOCKSConnect() { next_state_ = STATE_SOCKS_CONNECT_COMPLETE; - ClientSocket* s = socket_.release(); + StreamSocket* s = socket_.release(); HostResolver::RequestInfo req_info(HostPortPair::FromURL(url_)); DCHECK(!proxy_info_.is_empty()); diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index 9e85167..08d840c 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -300,7 +300,7 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> { scoped_ptr<SingleRequestHostResolver> resolver_; AddressList addresses_; - scoped_ptr<ClientSocket> socket_; + scoped_ptr<StreamSocket> socket_; SSLConfig ssl_config_; diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index 24a0ff0..c1e2d7d 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -188,7 +188,7 @@ class SocketStreamTest : public PlatformTest { frame.push_back('\xff'); EXPECT_TRUE(event->socket->SendData(&frame[0], frame.size())); } - // Actual ClientSocket close must happen after all frames queued by + // Actual StreamSocket close must happen after all frames queued by // SendData above are sent out. event->socket->Close(); } |