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

chrome/browser/net/chrome_url_request_context.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 "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_util.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
 
 // Sets up proxy info if overrides were specified on the command line.
 // Otherwise returns NULL (meaning we should use the system defaults).
 // The caller is responsible for deleting returned pointer.
 static net::ProxyInfo* CreateProxyInfo(const CommandLine& command_line) {
@@ skipping 47 matching lines @@
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
 
   if (record_mode || playback_mode) {
     // Don't use existing cookies and use an in-memory store.
     context->cookie_store_ = new net::CookieMonster();
     cache->set_mode(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
   context->http_transaction_factory_ = cache;
 
+  // The kNewFtp switch is Windows specific only because we have multiple FTP
+  // implementations on Windows.
+#if defined(OS_WIN)
+  if (command_line.HasSwitch(switches::kNewFtp))
+    context->ftp_transaction_factory_ = new net::FtpNetworkLayer;
+#else
+  context->ftp_transaction_factory_ = new net::FtpNetworkLayer;
+#endif
+
   // setup cookie store
   if (!context->cookie_store_) {
     DCHECK(!cookie_store_path.empty());
     context->cookie_db_.reset(new SQLitePersistentCookieStore(
         cookie_store_path.ToWStringHack(),
         g_browser_process->db_thread()->message_loop()));
     context->cookie_store_ = new net::CookieMonster(context->cookie_db_.get());
   }
 
   return context;
@@ skipping 186 matching lines @@
 
 ChromeURLRequestContext::~ChromeURLRequestContext() {
   DCHECK(NULL == prefs_);
 
   NotificationService::current()->Notify(
       NotificationType::URL_REQUEST_CONTEXT_RELEASED,
       Source<URLRequestContext>(this),
       NotificationService::NoDetails());
 
   delete cookie_store_;
+  delete ftp_transaction_factory_;
   delete http_transaction_factory_;
 
   // Do not delete the proxy service in the case of OTR, as it is owned by the
   // original URLRequestContext.
   if (!is_off_the_record_)
     delete proxy_service_;
 }