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 <stddef.h> | 7 #include <stddef.h> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 std::move(dhcp_proxy_script_fetcher), context->host_resolver(), | 184 std::move(dhcp_proxy_script_fetcher), context->host_resolver(), |
185 net_log, network_delegate); | 185 net_log, network_delegate); |
186 } | 186 } |
187 } else { | 187 } else { |
188 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( | 188 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( |
189 std::move(proxy_config_service), num_pac_threads, net_log); | 189 std::move(proxy_config_service), num_pac_threads, net_log); |
190 } | 190 } |
191 | 191 |
192 proxy_service->set_quick_check_enabled(quick_check_enabled); | 192 proxy_service->set_quick_check_enabled(quick_check_enabled); |
193 | 193 |
| 194 if (command_line.HasSwitch(switches::kUnsafePacUrl)) { |
| 195 proxy_service->set_sanitize_url_policy( |
| 196 net::ProxyService::SanitizeUrlPolicy::UNSAFE); |
| 197 } |
| 198 |
194 return proxy_service; | 199 return proxy_service; |
195 } | 200 } |
OLD | NEW |