| Index: chrome/browser/net/proxy_service_factory.cc
|
| diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
|
| index a738f083d67e6a597d5227916c128e0862ffbfc1..5c6937483fcbfcbecc3472f61d060688e5cea4f1 100644
|
| --- a/chrome/browser/net/proxy_service_factory.cc
|
| +++ b/chrome/browser/net/proxy_service_factory.cc
|
| @@ -77,6 +77,9 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
|
| const CommandLine& command_line) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| +#if defined(OS_IOS)
|
| + bool use_v8 = false;
|
| +#else
|
| bool use_v8 = !command_line.HasSwitch(switches::kWinHttpProxyResolver);
|
| if (use_v8 && command_line.HasSwitch(switches::kSingleProcess)) {
|
| // See the note about V8 multithreading in net/proxy/proxy_resolver_v8.h
|
| @@ -84,6 +87,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
|
| LOG(ERROR) << "Cannot use V8 Proxy resolver in single process mode.";
|
| use_v8 = false; // Fallback to non-v8 implementation.
|
| }
|
| +#endif // defined(OS_IOS)
|
|
|
| size_t num_pac_threads = 0u; // Use default number of threads.
|
|
|
| @@ -103,6 +107,9 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
|
|
|
| net::ProxyService* proxy_service;
|
| if (use_v8) {
|
| +#if defined(OS_IOS)
|
| + NOTREACHED();
|
| +#else
|
| net::DhcpProxyScriptFetcherFactory dhcp_factory;
|
| if (command_line.HasSwitch(switches::kDisableDhcpWpad)) {
|
| dhcp_factory.set_enabled(false);
|
| @@ -116,6 +123,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
|
| context->host_resolver(),
|
| net_log,
|
| context->network_delegate());
|
| +#endif // defined(OS_IOS)
|
| } else {
|
| proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
|
| proxy_config_service,
|
|
|