summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 01:56:44 +0000
committerpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 01:56:44 +0000
commit57486fd5b68831b8e3df30becd18c2dc2d4ba7f5 (patch)
tree73dc7e2784b97c1c1d9cbed12a957ea52e1b124c /net/proxy
parentc21fcc5b17f1a7234d7649dbc4d24c3b9918605f (diff)
downloadchromium_src-57486fd5b68831b8e3df30becd18c2dc2d4ba7f5.zip
chromium_src-57486fd5b68831b8e3df30becd18c2dc2d4ba7f5.tar.gz
chromium_src-57486fd5b68831b8e3df30becd18c2dc2d4ba7f5.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 Review URL: https://chromiumcodereview.appspot.com/11931024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index e4ea2b9..42117e3 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -21,6 +21,7 @@
#include "net/http/http_server_properties_impl.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/test/test_server.h"
+#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_file_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
@@ -66,7 +67,9 @@ class RequestContext : public URLRequestContext {
storage_.set_http_transaction_factory(new HttpCache(
network_session,
HttpCache::DefaultBackend::InMemory(0)));
- storage_.set_job_factory(new URLRequestJobFactoryImpl());
+ URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl();
+ job_factory->SetProtocolHandler("file", new FileProtocolHandler());
+ storage_.set_job_factory(job_factory);
}
virtual ~RequestContext() {