#include "chromeos/network/dhcp_proxy_script_fetcher_chromeos.h"
#endif // defined(OS_CHROMEOS)
-#if defined(OS_WIN)
-#include "win8/util/win8_util.h"
+#if !defined(OS_IOS)
+#include "net/proxy/proxy_resolver_v8.h"
#endif
using content::BrowserThread;
// that code be moved to chrome/browser instead of being in net, so that it
// can use BrowserThread instead of raw MessageLoop pointers? See bug 25354.
base_service.reset(net::ProxyService::CreateSystemProxyConfigService(
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(),
- BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE)));
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
#endif // !defined(OS_CHROMEOS)
return tracker->CreateTrackingProxyConfigService(base_service.Pass())
}
#endif // defined(OS_IOS)
-#if defined(OS_WIN)
- // Crashes. http://crbug.com/266838
- if (use_v8 && win8::IsSingleWindowMetroMode())
- use_v8 = false;
-#endif
-
size_t num_pac_threads = 0u; // Use default number of threads.
// Check the command line for an override on the number of proxy resolver
#if defined(OS_IOS)
NOTREACHED();
#else
+ net::ProxyResolverV8::EnsureIsolateCreated();
+
net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher;
#if defined(OS_CHROMEOS)
dhcp_proxy_script_fetcher =
new chromeos::DhcpProxyScriptFetcherChromeos(context);
#else
net::DhcpProxyScriptFetcherFactory dhcp_factory;
- if (command_line.HasSwitch(switches::kDisableDhcpWpad))
- dhcp_factory.set_enabled(false);
dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
#endif