diff options
| author | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 16:04:34 +0000 |
|---|---|---|
| committer | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 16:04:34 +0000 |
| commit | e0f35c91db833cf91df215ad3baf1471f6d5f962 (patch) | |
| tree | a552beed80f52a83d58248873977f79916f9ef7b /webkit/tools | |
| parent | 5be833caea8b86647772bc9829c4dacc1fc3d7b9 (diff) | |
| download | chromium_src-e0f35c91db833cf91df215ad3baf1471f6d5f962.zip chromium_src-e0f35c91db833cf91df215ad3baf1471f6d5f962.tar.gz chromium_src-e0f35c91db833cf91df215ad3baf1471f6d5f962.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188912
Review URL: https://chromiumcodereview.appspot.com/11931024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 014ba65..cc6956f 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/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/dns/host_resolver.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,8 @@ #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/data_protocol_handler.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 +115,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(); @@ -132,6 +130,8 @@ void TestShellRequestContext::Init( job_factory->SetProtocolHandler( "filesystem", fileapi::CreateFileSystemProtocolHandler(file_system_context_.get())); + job_factory->SetProtocolHandler("data", new net::DataProtocolHandler); + job_factory->SetProtocolHandler("file", new net::FileProtocolHandler); storage_.set_job_factory(job_factory); } |