blob: acdb553e32cdbd0d186976c4bebf13d4a91fb0e0 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- net/url_request/url_request_context_builder.cc.orig 2020-09-08 19:14:08 UTC
+++ net/url_request/url_request_context_builder.cc
@@ -485,7 +485,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
-#if !defined(OS_LINUX) && !defined(OS_ANDROID)
+#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
// TODO(willchan): Switch to using this code when
// ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s
// signature doesn't suck.
@@ -494,7 +494,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
base::ThreadTaskRunnerHandle::Get().get());
}
-#endif // !defined(OS_LINUX) && !defined(OS_ANDROID)
+#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
proxy_resolution_service_ = CreateProxyResolutionService(
std::move(proxy_config_service_), context.get(),
context->host_resolver(), context->network_delegate(),
|