diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 18:20:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 18:20:35 +0000 |
| commit | 07932c75fec8c5aead7365f1f6decccd4116ea80 (patch) | |
| tree | 347363bf32705b464e1bf145a453b2adf68d0ac5 /chrome/browser/net | |
| parent | 7e342930e757290f6bd1ba80ed9e25853d2e3e75 (diff) | |
| download | chromium_src-07932c75fec8c5aead7365f1f6decccd4116ea80.zip chromium_src-07932c75fec8c5aead7365f1f6decccd4116ea80.tar.gz chromium_src-07932c75fec8c5aead7365f1f6decccd4116ea80.tar.bz2 | |
Fix crash with new FTP in Incognito mode.
TEST=See bug.
http://crbug.com/18697
Review URL: http://codereview.chromium.org/165386
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index f6df4a2..2c19fbc 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -136,7 +136,7 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal( } context->http_transaction_factory_ = cache; - // The kNewFtp switch is Windows specific only because we have multiple FTP + // The kNewFtp switch is Windows specific because we have multiple FTP // implementations on Windows. #if defined(OS_WIN) if (command_line.HasSwitch(switches::kNewFtp)) @@ -207,6 +207,17 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOffTheRecord( new net::HttpCache(context->host_resolver_, context->proxy_service_, 0); context->cookie_store_ = new net::CookieMonster; + // The kNewFtp switch is Windows specific 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(context->host_resolver_); +#else + context->ftp_transaction_factory_ = + new net::FtpNetworkLayer(context->host_resolver_); +#endif + return context; } |