Fix crash with new FTP in Incognito mode.

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/privacy_blacklist/blacklist.h"
@@ skipping 189 matching lines @@
   // profile which we reference (see above).
   context->host_resolver_ =
       profile->GetOriginalProfile()->GetRequestContext()->host_resolver();
   context->proxy_service_ =
       profile->GetOriginalProfile()->GetRequestContext()->proxy_service();
 
   context->http_transaction_factory_ =
       new net::HttpCache(context->host_resolver_, context->proxy_service_, 0);
   context->cookie_store_ = new net::CookieMonster;
 
+  // The kNewFtp switch is Windows specific only because we have multiple FTP

[wtc, 2009/08/12 17:25:50]

Nit: pick one of "specific" and "only".  We don't need both.

Hmm... I wonder if I wrote this comment :-)

Have you thought about whether the OTR URL request context
can just use the FTP transaction factory of the original
profile?  It seems that would be problematic when we start
to cache FTP directory listings.

+  // implementations on Windows.
+#if defined(OS_WIN)
+  if (command_line.HasSwitch(switches::kNewFtp))
+    context->ftp_transaction_factory_ =
+        new net::FtpNetworkLayer(context->host_resolver_);
+#else
+  context->ftp_transaction_factory_ =
+      new net::FtpNetworkLayer(context->host_resolver_);
+#endif
+
   return context;
 }
 
 // static
 ChromeURLRequestContext*
 ChromeURLRequestContext::CreateOffTheRecordForExtensions(Profile* profile) {
   DCHECK(profile->IsOffTheRecord());
   ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
   net::CookieMonster* cookie_monster = new net::CookieMonster;
 
@@ skipping 36 matching lines @@
                                disk_cache_path.ToWStringHack(), cache_size);
   } else {
     // If original HttpCache doesn't exist, simply construct one with a whole
     // new set of network stack.
     cache = new net::HttpCache(original_context->host_resolver(),
                                original_context->proxy_service(),
                                disk_cache_path.ToWStringHack(), cache_size);
   }
 
   cache->set_type(net::MEDIA_CACHE);
   context->http_transaction_factory_ = cache;

[wtc, 2009/08/12 17:25:50]

I wonder if we should set ftp_transaction_factory_ for
other kinds of ChromeURLRequestContext, for example, here.

   return context;
 }
 
 ChromeURLRequestContext::ChromeURLRequestContext(Profile* profile)
     : prefs_(profile->GetPrefs()),
       is_media_(false),
       is_off_the_record_(profile->IsOffTheRecord()) {
   // Set up Accept-Language and Accept-Charset header values
   accept_language_ = net::HttpUtil::GenerateAcceptLanguageHeader(
       WideToASCII(prefs_->GetString(prefs::kAcceptLanguages)));
@@ skipping 225 matching lines @@
   // Do not delete the cookie store in the case of the media context, as it is
   // owned by the original context.
   if (!is_media_)
     delete cookie_store_;
 
   // Do not delete the proxy service in the case of OTR or media contexts, as
   // it is owned by the original URLRequestContext.
   if (!is_off_the_record_ && !is_media_)
     delete proxy_service_;
 }