38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Tue, 5 Jun 2018 13:46:40 +0200
|
|
Subject: Always respect async dns flag (regardless of SDK version)
|
|
|
|
Do not read experiment value for cronet async DNS configuration
|
|
---
|
|
chrome/browser/net/system_network_context_manager.cc | 2 +-
|
|
components/cronet/url_request_context_config.cc | 3 ++-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
|
|
--- a/chrome/browser/net/system_network_context_manager.cc
|
|
+++ b/chrome/browser/net/system_network_context_manager.cc
|
|
@@ -152,7 +152,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams(
|
|
local_state->GetBoolean(prefs::kNtlmV2Enabled);
|
|
#endif // defined(OS_POSIX)
|
|
|
|
-#if defined(OS_ANDROID)
|
|
+#if 0
|
|
auth_dynamic_params->android_negotiate_account_type =
|
|
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
|
|
#endif // defined(OS_ANDROID)
|
|
diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
|
|
--- a/components/cronet/url_request_context_config.cc
|
|
+++ b/components/cronet/url_request_context_config.cc
|
|
@@ -562,7 +562,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
|
|
effective_experimental_options->Remove(it.key(), nullptr);
|
|
continue;
|
|
}
|
|
- async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
|
|
+ bool ignored;
|
|
+ async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored);
|
|
} else if (it.key() == kStaleDnsFieldTrialName) {
|
|
const base::DictionaryValue* stale_dns_args = nullptr;
|
|
if (!it.value().GetAsDictionary(&stale_dns_args)) {
|
|
--
|
|
2.17.1
|
|
|