From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Tue, 26 Jan 2021 00:21:51 +0100
Subject: Ignore managed state for secure DNS

---
 chrome/browser/net/stub_resolver_config_reader.cc | 3 +--
 chrome/browser/privacy/secure_dns_bridge.cc       | 9 ++-------
 2 files changed, 3 insertions(+), 9 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
@@ -269,8 +269,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration(
   SecureDnsModeDetailsForHistogram mode_details;
   SecureDnsConfig::ManagementMode forced_management_mode =
       SecureDnsConfig::ManagementMode::kNoOverride;
-  bool is_managed =
-      local_state_->FindPreference(prefs::kDnsOverHttpsMode)->IsManaged();
+  bool is_managed = false;
   if (!is_managed && ShouldDisableDohForManaged()) {
     secure_dns_mode = net::SecureDnsMode::kOff;
     forced_management_mode = SecureDnsConfig::ManagementMode::kDisabledManaged;
diff --git a/chrome/browser/privacy/secure_dns_bridge.cc b/chrome/browser/privacy/secure_dns_bridge.cc
--- a/chrome/browser/privacy/secure_dns_bridge.cc
+++ b/chrome/browser/privacy/secure_dns_bridge.cc
@@ -86,8 +86,7 @@ static void JNI_SecureDnsBridge_SetMode(JNIEnv* env, jint mode) {
 }
 
 static jboolean JNI_SecureDnsBridge_IsModeManaged(JNIEnv* env) {
-  PrefService* local_state = g_browser_process->local_state();
-  return local_state->IsManagedPreference(prefs::kDnsOverHttpsMode);
+  return false;
 }
 
 static ScopedJavaLocalRef<jobjectArray> JNI_SecureDnsBridge_GetProviders(
@@ -131,11 +130,7 @@ static jboolean JNI_SecureDnsBridge_SetTemplates(
 }
 
 static jint JNI_SecureDnsBridge_GetManagementMode(JNIEnv* env) {
-  return static_cast<int>(
-      SystemNetworkContextManager::GetStubResolverConfigReader()
-          ->GetSecureDnsConfiguration(
-              true /* force_check_parental_controls_for_automatic_mode */)
-          .management_mode());
+  return static_cast<int>(SecureDnsConfig::ManagementMode::kNoOverride);
 }
 
 static void JNI_SecureDnsBridge_UpdateDropdownHistograms(
-- 
2.17.1