Add command line switch "--new-ftp" for new portable...

net/url_request/url_request_ftp_job.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_ftp_job.h"
 
 #include <windows.h>
 #include <wininet.h>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/base/auth.h"
+#include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/base/wininet_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
-#include "net/base/escape.h"
+#include "net/url_request/url_request_new_ftp_job.h"
 
 using std::string;
 
 using net::WinInetUtil;
 
 // When building the directory listing, the period to wait before notifying
 // the parent class that we wrote the data.
 #define kFtpBufferTimeMs 50
 
 static bool UnescapeAndValidatePath(const URLRequest* request,
@@ skipping 15 matching lines @@
     DCHECK(unescaped_path->find(std::string("\x00", 1)) == std::string::npos) <<
         "Path should not contain %00.";
     return false;
   }
   return true;
 }
 
 // static
 URLRequestJob* URLRequestFtpJob::Factory(URLRequest* request,
                                          const std::string &scheme) {
+  // Checking whether we are using new or old FTP implementation.
+  if (request->context() && request->context()->ftp_transaction_factory())
+    return URLRequestNewFtpJob::Factory(request, scheme);
+
   DCHECK(scheme == "ftp");
 
   if (request->url().has_port() &&
       !net::IsPortAllowedByFtp(request->url().IntPort()))
     return new URLRequestErrorJob(request, net::ERR_UNSAFE_PORT);
 
   return new URLRequestFtpJob(request);
 }
 
 URLRequestFtpJob::URLRequestFtpJob(URLRequest* request)
@@ skipping 457 matching lines @@
       replacements.SetPathStr(ftp_path);
 
       *location = request_->url().ReplaceComponents(replacements);
       *http_status_code = 301;  // simulate a permanent redirect
       return true;
     }
   }
 
   return false;
 }