| Index: net/url_request/url_request_context_builder.cc
|
| diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
|
| index f1cf1aaa0c061f838ce6ab1fd0955919219b3cfe..94d79f783a2de7d4afc0b44820e0c0d2709619be 100644
|
| --- a/net/url_request/url_request_context_builder.cc
|
| +++ b/net/url_request/url_request_context_builder.cc
|
| @@ -19,7 +19,6 @@
|
| #include "net/base/ssl_config_service_defaults.h"
|
| #include "net/base/transport_security_state.h"
|
| #include "net/cookies/cookie_monster.h"
|
| -#include "net/ftp/ftp_network_layer.h"
|
| #include "net/http/http_auth_handler_factory.h"
|
| #include "net/http/http_cache.h"
|
| #include "net/http/http_network_layer.h"
|
| @@ -180,8 +179,7 @@ URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
|
| {}
|
|
|
| URLRequestContextBuilder::URLRequestContextBuilder()
|
| - : ftp_enabled_(false),
|
| - http_cache_enabled_(true) {}
|
| + : http_cache_enabled_(true) {}
|
| URLRequestContextBuilder::~URLRequestContextBuilder() {}
|
|
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| @@ -204,11 +202,6 @@ URLRequestContext* URLRequestContextBuilder::Build() {
|
|
|
| storage->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
|
|
|
| - if (ftp_enabled_) {
|
| - storage->set_ftp_transaction_factory(
|
| - new FtpNetworkLayer(context->host_resolver()));
|
| - }
|
| -
|
| context->StartFileThread();
|
|
|
| // TODO(willchan): Switch to using this code when
|
|
|