Don't trust server's PASV response that much in FtpNetworkTransaction.

TEST=Covered by net_unittests.
http://crbug.com/20334

Review URL: http://codereview.chromium.org/180011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24818 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 4b6a3ad..cd4423b 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -65,7 +65,8 @@ void MockClientSocket::RunCallback(int result) {
 
 MockTCPClientSocket::MockTCPClientSocket(const net::AddressList& addresses,
                                          net::MockSocket* socket)
-    : data_(socket),
+    : addresses_(addresses),
+      data_(socket),
       read_offset_(0),
       read_data_(true, net::ERR_UNEXPECTED),
       need_read_data_(true) {
@@ -290,18 +291,19 @@ void MockClientSocketFactory::ResetNextMockIndexes() {
   mock_ssl_sockets_.ResetNextIndex();
 }
 
-ClientSocket* MockClientSocketFactory::GetMockTCPClientSocket(int index) const {
+MockTCPClientSocket* MockClientSocketFactory::GetMockTCPClientSocket(
+    int index) const {
   return tcp_client_sockets_[index];
 }
 
-SSLClientSocket* MockClientSocketFactory::GetMockSSLClientSocket(
+MockSSLClientSocket* MockClientSocketFactory::GetMockSSLClientSocket(
     int index) const {
   return ssl_client_sockets_[index];
 }
 
 ClientSocket* MockClientSocketFactory::CreateTCPClientSocket(
     const AddressList& addresses) {
-  ClientSocket* socket =
+  MockTCPClientSocket* socket =
       new MockTCPClientSocket(addresses, mock_sockets_.GetNext());
   tcp_client_sockets_.push_back(socket);
   return socket;
@@ -311,7 +313,7 @@ SSLClientSocket* MockClientSocketFactory::CreateSSLClientSocket(
     ClientSocket* transport_socket,
     const std::string& hostname,
     const SSLConfig& ssl_config) {
-  SSLClientSocket* socket =
+  MockSSLClientSocket* socket =
       new MockSSLClientSocket(transport_socket, hostname, ssl_config,
                               mock_ssl_sockets_.GetNext());
   ssl_client_sockets_.push_back(socket);