diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
| commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
| tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/components/proxy_config | |
| parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
| download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz | |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/proxy_config')
3 files changed, 4 insertions, 3 deletions
diff --git a/chromium/components/proxy_config/ios/proxy_service_factory.cc b/chromium/components/proxy_config/ios/proxy_service_factory.cc index 4fd697975de..f24037e596d 100644 --- a/chromium/components/proxy_config/ios/proxy_service_factory.cc +++ b/chromium/components/proxy_config/ios/proxy_service_factory.cc @@ -54,6 +54,6 @@ ProxyServiceFactory::CreateProxyResolutionService( DCHECK_CURRENTLY_ON(web::WebThread::IO); std::unique_ptr<net::ProxyResolutionService> proxy_resolution_service( net::ConfiguredProxyResolutionService::CreateUsingSystemProxyResolver( - std::move(proxy_config_service), quick_check_enabled, net_log)); + std::move(proxy_config_service), net_log, quick_check_enabled)); return proxy_resolution_service; } diff --git a/chromium/components/proxy_config/proxy_config_dictionary.cc b/chromium/components/proxy_config/proxy_config_dictionary.cc index b5304bea24f..f428939f807 100644 --- a/chromium/components/proxy_config/proxy_config_dictionary.cc +++ b/chromium/components/proxy_config/proxy_config_dictionary.cc @@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/logging.h" +#include "base/check.h" #include "net/proxy_resolution/proxy_config.h" namespace { diff --git a/chromium/components/proxy_config/proxy_prefs.cc b/chromium/components/proxy_config/proxy_prefs.cc index 30eef91ef68..db6c6d6b65c 100644 --- a/chromium/components/proxy_config/proxy_prefs.cc +++ b/chromium/components/proxy_config/proxy_prefs.cc @@ -4,7 +4,8 @@ #include "components/proxy_config/proxy_prefs.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/stl_util.h" namespace ProxyPrefs { |