OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/net/proxy_service_factory.h" | 5 #include "chrome/browser/net/proxy_service_factory.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 #if defined(OS_IOS) | 110 #if defined(OS_IOS) |
111 NOTREACHED(); | 111 NOTREACHED(); |
112 #else | 112 #else |
113 net::DhcpProxyScriptFetcherFactory dhcp_factory; | 113 net::DhcpProxyScriptFetcherFactory dhcp_factory; |
114 if (command_line.HasSwitch(switches::kDisableDhcpWpad)) { | 114 if (command_line.HasSwitch(switches::kDisableDhcpWpad)) { |
115 dhcp_factory.set_enabled(false); | 115 dhcp_factory.set_enabled(false); |
116 } | 116 } |
117 | 117 |
118 proxy_service = net::CreateProxyServiceUsingV8ProxyResolver( | 118 proxy_service = net::CreateProxyServiceUsingV8ProxyResolver( |
119 proxy_config_service, | 119 proxy_config_service, |
120 num_pac_threads, | |
121 new net::ProxyScriptFetcherImpl(context), | 120 new net::ProxyScriptFetcherImpl(context), |
122 dhcp_factory.Create(context), | 121 dhcp_factory.Create(context), |
123 context->host_resolver(), | 122 context->host_resolver(), |
124 net_log, | 123 net_log, |
125 context->network_delegate()); | 124 context->network_delegate()); |
126 #endif // defined(OS_IOS) | 125 #endif // defined(OS_IOS) |
127 } else { | 126 } else { |
128 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( | 127 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( |
129 proxy_config_service, | 128 proxy_config_service, |
130 num_pac_threads, | 129 num_pac_threads, |
131 net_log); | 130 net_log); |
132 } | 131 } |
133 | 132 |
134 return proxy_service; | 133 return proxy_service; |
135 } | 134 } |
OLD | NEW |