From 57486fd5b68831b8e3df30becd18c2dc2d4ba7f5 Mon Sep 17 00:00:00 2001 From: "pauljensen@chromium.org" Date: Tue, 19 Mar 2013 01:56:44 +0000 Subject: Removed static factories for data, ftp, file, and about jobs. Instead add corresponding ProtocolHandlers as needed. Remove URLRequestContext members used by these static factories. Bake FtpAuthCache into FtpProtocolHandler as it was already unique per FtpProtocolHandler. This is a revived version of http://crrev.com/10836206 BUG=142945 Review URL: https://chromiumcodereview.appspot.com/11931024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188912 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_shell_request_context.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'webkit/tools') diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index bfd2eb4d..1e71999 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -13,7 +13,6 @@ #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" @@ -23,6 +22,7 @@ #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,9 +114,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( WebKit::Platform::current()->fileSystem())->file_system_context(); @@ -132,6 +129,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); } -- cgit v1.1