1 files changed, 9 insertions, 13 deletions
diff --git a/chromium/net/socket/socks_connect_job_unittest.cc b/chromium/net/socket/socks_connect_job_unittest.cc
index f7614b0f365..c5c87f5116a 100644
--- a/chromium/net/socket/socks_connect_job_unittest.cc
+++ b/chromium/net/socket/socks_connect_job_unittest.cc
@@ -16,7 +16,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/network_isolation_key.h"
 #include "net/dns/mock_host_resolver.h"
-#include "net/dns/public/secure_dns_mode.h"
+#include "net/dns/public/secure_dns_policy.h"
 #include "net/log/net_log.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
@@ -69,11 +69,11 @@ class SOCKSConnectJobTest : public testing::Test, public WithTaskEnvironment {
 
   static scoped_refptr<SOCKSSocketParams> CreateSOCKSParams(
       SOCKSVersion socks_version,
-      bool disable_secure_dns = false) {
+      SecureDnsPolicy secure_dns_policy = SecureDnsPolicy::kAllow) {
     return base::MakeRefCounted<SOCKSSocketParams>(
         base::MakeRefCounted<TransportSocketParams>(
             HostPortPair(kProxyHostName, kProxyPort), NetworkIsolationKey(),
-            disable_secure_dns, OnHostResolutionCallback()),
+            secure_dns_policy, OnHostResolutionCallback()),
         socks_version == SOCKSVersion::V5,
         socks_version == SOCKSVersion::V4
             ? HostPortPair(kSOCKS4TestHost, kSOCKS4TestPort)
@@ -120,7 +120,7 @@ TEST_F(SOCKSConnectJobTest, HostResolutionFailureSOCKS4Endpoint) {
         base::MakeRefCounted<SOCKSSocketParams>(
             base::MakeRefCounted<TransportSocketParams>(
                 HostPortPair(kProxyHostName, kProxyPort), NetworkIsolationKey(),
-                false /* disable_secure_dns */, OnHostResolutionCallback()),
+                SecureDnsPolicy::kAllow, OnHostResolutionCallback()),
             false /* socks_v5 */, HostPortPair(hostname, kSOCKS4TestPort),
             NetworkIsolationKey(), TRAFFIC_ANNOTATION_FOR_TESTS);
 
@@ -388,20 +388,16 @@ TEST_F(SOCKSConnectJobTest, Priority) {
   }
 }
 
-TEST_F(SOCKSConnectJobTest, DisableSecureDns) {
-  for (bool disable_secure_dns : {false, true}) {
+TEST_F(SOCKSConnectJobTest, SecureDnsPolicy) {
+  for (auto secure_dns_policy :
+       {SecureDnsPolicy::kAllow, SecureDnsPolicy::kDisable}) {
     TestConnectJobDelegate test_delegate;
     SOCKSConnectJob socks_connect_job(
         DEFAULT_PRIORITY, SocketTag(), &common_connect_job_params_,
-        CreateSOCKSParams(SOCKSVersion::V4, disable_secure_dns), &test_delegate,
+        CreateSOCKSParams(SOCKSVersion::V4, secure_dns_policy), &test_delegate,
         nullptr /* net_log */);
     ASSERT_THAT(socks_connect_job.Connect(), test::IsError(ERR_IO_PENDING));
-    EXPECT_EQ(disable_secure_dns,
-              host_resolver_.last_secure_dns_mode_override().has_value());
-    if (disable_secure_dns) {
-      EXPECT_EQ(net::SecureDnsMode::kOff,
-                host_resolver_.last_secure_dns_mode_override().value());
-    }
+    EXPECT_EQ(secure_dns_policy, host_resolver_.last_secure_dns_policy());
   }
 }