1 files changed, 10 insertions, 9 deletions
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 09d20182d1b7..ecfe40f88d54 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2021-05-12 22:05:57 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2021-07-19 18:45:19 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -6,7 +6,9 @@
  
@@ -10,15 +10,15 @@
  #include <unistd.h>
  
  #include <map>
-@@ -512,6 +514,7 @@ int StringToIntOrDefault(base::StringPiece value, int 
-   return default_value;
+@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion(
  }
+ #endif  // defined(USE_GIO)
  
 +#if !defined(OS_BSD)
- // This is the KDE version that reads kioslaverc and simulates gsettings.
- // Doing this allows the main Delegate code, as well as the unit tests
- // for it, to stay the same - and the settings map fairly well besides.
-@@ -1002,6 +1005,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+ // Converts |value| from a decimal string to an int. If there was a failure
+ // parsing, returns |default_value|.
+ int StringToIntOrDefault(base::StringPiece value, int default_value) {
+@@ -1003,6 +1006,7 @@ class SettingGetterImplKDE : public ProxyConfigService
  
    DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
  };
@@ -26,12 +26,13 @@
  
  }  // namespace
  
-@@ -1216,8 +1220,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1217,9 +1221,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE3:
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
 +#if !defined(OS_BSD)
-       setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get()));
+       setting_getter_ =
+           std::make_unique<SettingGetterImplKDE>(env_var_getter_.get());
        break;
 +#endif
      case base::nix::DESKTOP_ENVIRONMENT_XFCE: