12345678910111213141516171819202122232425262728293031323334353637383940414243 |
- From: csagan5 <32685696+csagan5@users.noreply.github.com>
- Date: Sat, 26 Sep 2020 14:23:19 +0100
- Subject: DoH secure mode by default
- ---
- .../browser/net/stub_resolver_config_reader.cc | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
- diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc
- --- a/chrome/browser/net/stub_resolver_config_reader.cc
- +++ b/chrome/browser/net/stub_resolver_config_reader.cc
- @@ -154,7 +154,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state,
- if (entries.count("dns-over-https@1")) {
- // The user has "Enabled" selected.
- local_state_->SetString(prefs::kDnsOverHttpsMode,
- - SecureDnsConfig::kModeAutomatic);
- + SecureDnsConfig::kModeSecure);
- } else if (entries.count("dns-over-https@2")) {
- // The user has "Disabled" selected.
- local_state_->SetString(prefs::kDnsOverHttpsMode,
- @@ -334,22 +334,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration(
- check_parental_controls = false;
- }
-
- - // Check parental controls last because it can be expensive and should only be
- - // checked if necessary for the otherwise-determined mode.
- if (check_parental_controls) {
- - if (ShouldDisableDohForParentalControls()) {
- - forced_management_mode =
- - SecureDnsConfig::ManagementMode::kDisabledParentalControls;
- - secure_dns_mode = net::SecureDnsMode::kOff;
- - mode_details =
- - SecureDnsModeDetailsForHistogram::kOffByDetectedParentalControls;
- -
- - // If parental controls had not previously been checked, need to update
- - // network service.
- - if (!parental_controls_checked_)
- - update_network_service = true;
- - }
- -
- parental_controls_checked_ = true;
- }
-
|