Index: trunk/src/webkit/tools/test_shell/test_shell_request_context.cc |
=================================================================== |
--- trunk/src/webkit/tools/test_shell/test_shell_request_context.cc (revision 188924) |
+++ trunk/src/webkit/tools/test_shell/test_shell_request_context.cc (working copy) |
@@ -13,6 +13,7 @@ |
#include "net/base/cert_verifier.h" |
#include "net/base/host_resolver.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" |
@@ -22,7 +23,6 @@ |
#include "net/ssl/default_server_bound_cert_store.h" |
#include "net/ssl/server_bound_cert_service.h" |
#include "net/ssl/ssl_config_service_defaults.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" |
@@ -114,6 +114,9 @@ |
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(); |
@@ -129,7 +132,6 @@ |
job_factory->SetProtocolHandler( |
"filesystem", |
fileapi::CreateFileSystemProtocolHandler(file_system_context_.get())); |
- job_factory->SetProtocolHandler("file", new net::FileProtocolHandler); |
storage_.set_job_factory(job_factory); |
} |