Differential D23984 Diff 69253 www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
| --- chrome/browser/net/system_network_context_manager.cc.orig 2019-12-16 21:51:23 UTC | --- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-03 18:53:51 UTC | ||||
| +++ chrome/browser/net/system_network_context_manager.cc | +++ chrome/browser/net/system_network_context_manager.cc | ||||
| @@ -81,11 +81,11 @@ | @@ -79,11 +79,11 @@ | ||||
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | ||||
| #endif // defined(OS_CHROMEOS) | #endif // defined(OS_CHROMEOS) | ||||
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
| +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| #include "chrome/common/chrome_paths_internal.h" | #include "chrome/common/chrome_paths_internal.h" | ||||
| #include "chrome/grit/chromium_strings.h" | #include "chrome/grit/chromium_strings.h" | ||||
| #include "ui/base/l10n/l10n_util.h" | #include "ui/base/l10n/l10n_util.h" | ||||
| -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
| +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| #if BUILDFLAG(ENABLE_EXTENSIONS) | #if defined(OS_WIN) || defined(OS_MACOSX) | ||||
| #include "extensions/common/constants.h" | #include "content/public/common/network_service_util.h" | ||||
| @@ -209,10 +209,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut | @@ -211,10 +211,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut | ||||
| auth_dynamic_params->enable_negotiate_port = | auth_dynamic_params->enable_negotiate_port = | ||||
| local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); | local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); | ||||
| -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | ||||
| +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| auth_dynamic_params->delegate_by_kdc_policy = | auth_dynamic_params->delegate_by_kdc_policy = | ||||
| local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); | local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); | ||||
| -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | ||||
| +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| #if defined(OS_POSIX) | #if defined(OS_POSIX) | ||||
| auth_dynamic_params->ntlm_v2_enabled = | auth_dynamic_params->ntlm_v2_enabled = | ||||
| @@ -476,10 +476,10 @@ SystemNetworkContextManager::SystemNetworkContextManag | @@ -480,10 +480,10 @@ SystemNetworkContextManager::SystemNetworkContextManag | ||||
| pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, | pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, | ||||
| auth_pref_callback); | auth_pref_callback); | ||||
| -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | ||||
| +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, | pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, | ||||
| auth_pref_callback); | auth_pref_callback); | ||||
| -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | ||||
| +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| #if defined(OS_POSIX) | #if defined(OS_POSIX) | ||||
| pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); | pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); | ||||
| @@ -531,10 +531,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe | @@ -535,10 +535,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe | ||||
| registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | ||||
| registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | ||||
| std::string()); | std::string()); | ||||
| -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | ||||
| +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, | registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, | ||||
| false); | false); | ||||
| -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | ||||
| +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| #if defined(OS_POSIX) | #if defined(OS_POSIX) | ||||
| registry->RegisterBooleanPref( | registry->RegisterBooleanPref( | ||||
| @@ -645,7 +645,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea | @@ -643,7 +643,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea | ||||
| insecure_stub_resolver_enabled, secure_dns_mode, | insecure_stub_resolver_enabled, secure_dns_mode, | ||||
| std::move(dns_over_https_servers)); | std::move(dns_over_https_servers)); | ||||
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
| +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | ||||
| const base::CommandLine& command_line = | const base::CommandLine& command_line = | ||||
| *base::CommandLine::ForCurrentProcess(); | *base::CommandLine::ForCurrentProcess(); | ||||