Revert "FTP: fix navigation to systems with broken EPSV support."i

XP Perf test regression diagnostic - http://build.chromium.org/buildbot/waterfall/builders/XP%20Perf%20(1)/builds/9081

This reverts commit r53882.

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

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

1 files changed, 0 insertions, 15 deletions

diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 471e8c9..f6b7203 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -1187,22 +1187,7 @@ int FtpNetworkTransaction::DoDataConnect() {
 }
 
 int FtpNetworkTransaction::DoDataConnectComplete(int result) {
-  if (result == ERR_CONNECTION_TIMED_OUT && use_epsv_) {
-    // It's possible we hit a broken server, sadly. Fall back to PASV.
-    // TODO(phajdan.jr): remember it for future transactions with this server.
-    // TODO(phajdan.jr): write a test for this code path.
-    use_epsv_ = false;
-    next_state_ = STATE_CTRL_WRITE_PASV;
-    return OK;
-  }
-
-  // Only record the connection error after we've applied all our fallbacks.
-  // We want to capture the final error, one we're not going to recover from.
   RecordDataConnectionError(result);
-
-  if (result != OK)
-    return Stop(result);
-
   next_state_ = STATE_CTRL_WRITE_SIZE;
   return OK;
 }