summaryrefslogtreecommitdiffstats
path: root/net/ftp
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/ftp
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/ftp')
-rw-r--r--net/ftp/ftp_network_transaction.cc2
-rw-r--r--net/ftp/ftp_network_transaction.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 885fd8f..47b672a 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -18,8 +18,8 @@
#include "net/ftp/ftp_network_session.h"
#include "net/ftp/ftp_request_info.h"
#include "net/ftp/ftp_util.h"
-#include "net/socket/client_socket.h"
#include "net/socket/client_socket_factory.h"
+#include "net/socket/stream_socket.h"
// TODO(ibrar): Try to avoid sscanf.
#if !defined(COMPILER_MSVC)
diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h
index 5a69e8e..1893190 100644
--- a/net/ftp/ftp_network_transaction.h
+++ b/net/ftp/ftp_network_transaction.h
@@ -21,9 +21,9 @@
namespace net {
-class ClientSocket;
class ClientSocketFactory;
class FtpNetworkSession;
+class StreamSocket;
class FtpNetworkTransaction : public FtpTransaction {
public:
@@ -239,8 +239,8 @@ class FtpNetworkTransaction : public FtpTransaction {
ClientSocketFactory* socket_factory_;
- scoped_ptr<ClientSocket> ctrl_socket_;
- scoped_ptr<ClientSocket> data_socket_;
+ scoped_ptr<StreamSocket> ctrl_socket_;
+ scoped_ptr<StreamSocket> data_socket_;
State next_state_;
};