summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 6d881be..c74f6de 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -212,15 +212,10 @@ ProxyService::ProxyService(ProxyConfigService* config_service,
// static
ProxyService* ProxyService::Create(
- const ProxyConfig* pc,
+ ProxyConfigService* proxy_config_service,
bool use_v8_resolver,
URLRequestContext* url_request_context,
- MessageLoop* io_loop, MessageLoop* file_loop) {
- // Choose the system configuration service appropriate for each platform.
- ProxyConfigService* proxy_config_service = pc ?
- new ProxyConfigServiceFixed(*pc) :
- CreateSystemProxyConfigService(io_loop, file_loop);
-
+ MessageLoop* io_loop) {
ProxyResolver* proxy_resolver;
if (use_v8_resolver) {
@@ -253,7 +248,7 @@ ProxyService* ProxyService::Create(
// static
ProxyService* ProxyService::CreateFixed(const ProxyConfig& pc) {
- return Create(&pc, false, NULL, NULL, NULL);
+ return Create(new ProxyConfigServiceFixed(pc), false, NULL, NULL);
}
// static