| Index: webkit/tools/test_shell/test_shell_request_context.cc
|
| diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
|
| index 31ed78b93aa5d95663562ea58fa6d23d17135e67..df63d15bce9deddaca67235f147ef45de061d159 100644
|
| --- a/webkit/tools/test_shell/test_shell_request_context.cc
|
| +++ b/webkit/tools/test_shell/test_shell_request_context.cc
|
| @@ -16,13 +16,13 @@
|
| #include "net/base/server_bound_cert_service.h"
|
| #include "net/base/ssl_config_service_defaults.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_network_session.h"
|
| #include "net/http/http_server_properties_impl.h"
|
| #include "net/proxy/proxy_config_service.h"
|
| #include "net/proxy/proxy_config_service_fixed.h"
|
| #include "net/proxy/proxy_service.h"
|
| +#include "net/url_request/file_protocol_handler.h"
|
| #include "net/url_request/http_user_agent_settings.h"
|
| #include "net/url_request/url_request_job_factory_impl.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
|
| @@ -117,9 +117,6 @@ void TestShellRequestContext::Init(
|
| cache->set_mode(cache_mode);
|
| storage_.set_http_transaction_factory(cache);
|
|
|
| - storage_.set_ftp_transaction_factory(
|
| - new net::FtpNetworkLayer(host_resolver()));
|
| -
|
| blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
|
| file_system_context_ = static_cast<SimpleFileSystem*>(
|
| WebKit::Platform::current()->fileSystem())->file_system_context();
|
| @@ -135,6 +132,7 @@ void TestShellRequestContext::Init(
|
| job_factory->SetProtocolHandler(
|
| "filesystem",
|
| fileapi::CreateFileSystemProtocolHandler(file_system_context_.get()));
|
| + job_factory->SetProtocolHandler("file", new net::FileProtocolHandler);
|
| storage_.set_job_factory(job_factory);
|
| }
|
|
|
|
|