1 files changed, 19 insertions, 19 deletions

diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index d78ddf44d9d0..9a40f6e5a6a2 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2020-09-08 19:14:00 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2020-11-13 06:36:37 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
 @@ -77,11 +77,11 @@
  #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -18,47 +18,47 @@
    auth_dynamic_params->enable_negotiate_port =
        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) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
    auth_dynamic_params->delegate_by_kdc_policy =
        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) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
  #if defined(OS_POSIX)
    auth_dynamic_params->ntlm_v2_enabled =
-@@ -355,10 +355,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -356,10 +356,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
                               auth_pref_callback);
  
--#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_MAC) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
--#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_MAC) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
  #if defined(OS_POSIX)
    pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
-@@ -405,10 +405,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
-   registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
-   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
+@@ -406,10 +406,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+   registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
+   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
                                 std::string());
--#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_MAC) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
--#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_MAC) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
  
  #if defined(OS_POSIX)
    registry->RegisterBooleanPref(
-@@ -491,7 +491,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -492,7 +492,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    // NetworkContext is created, but before anything has the chance to use it.
    stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */);
  
 -#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) || defined(OS_BSD)
    const base::CommandLine& command_line =
        *base::CommandLine::ForCurrentProcess();