| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 |
- --- a/chrome/common/chrome_features.cc
- +++ b/chrome/common/chrome_features.cc
- @@ -334,12 +334,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
- // Enable DNS over HTTPS (DoH).
- BASE_FEATURE(kDnsOverHttps,
- "DnsOverHttps",
- -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
- - base::FEATURE_ENABLED_BY_DEFAULT
- -#else
- base::FEATURE_DISABLED_BY_DEFAULT
- -#endif
- );
-
- // Set whether fallback to insecure DNS is allowed by default. This setting may
- --- a/net/dns/public/doh_provider_entry.cc
- +++ b/net/dns/public/doh_provider_entry.cc
- @@ -160,32 +160,6 @@ const DohProviderEntry::List& DohProvide
- /*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
- LoggingLevel::kNormal),
- new DohProviderEntry(
- - "Google",
- - MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- - DohProviderGoogle, base::FEATURE_ENABLED_BY_DEFAULT),
- - DohProviderIdForHistogram::kGoogle,
- - {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
- - "2001:4860:4860::8844"},
- - /*dns_over_tls_hostnames=*/
- - {"dns.google", "dns.google.com", "8888.google"},
- - "https://dns.google/dns-query{?dns}",
- - /*ui_name=*/"Google (Public DNS)",
- - "https://developers.google.com/speed/public-dns/"
- - /*privacy_policy=*/"privacy",
- - /*display_globally=*/true, /*display_countries=*/{},
- - LoggingLevel::kExtra),
- - new DohProviderEntry(
- - "GoogleDns64",
- - MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- - DohProviderGoogleDns64, base::FEATURE_ENABLED_BY_DEFAULT),
- - /*provider_id_for_histogram=*/absl::nullopt,
- - {"2001:4860:4860::64", "2001:4860:4860::6464"},
- - /*dns_over_tls_hostnames=*/{"dns64.dns.google"},
- - "https://dns64.dns.google/dns-query{?dns}",
- - /*ui_name=*/"", /*privacy_policy=*/"",
- - /*display_globally=*/false,
- - /*display_countries=*/{}, LoggingLevel::kNormal),
- - new DohProviderEntry(
- "Iij",
- MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(
- DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
- --- a/services/network/public/cpp/features.cc
- +++ b/services/network/public/cpp/features.cc
- @@ -95,12 +95,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
- // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
- BASE_FEATURE(kDnsOverHttpsUpgrade,
- "DnsOverHttpsUpgrade",
- -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
- - base::FEATURE_ENABLED_BY_DEFAULT
- -#else
- base::FEATURE_DISABLED_BY_DEFAULT
- -#endif
- );
-
- // If this feature is enabled, the mDNS responder service responds to queries
|
