Add a SecureDnsPolicy to the request parameters
This change replaces
net::HostManager::ResolveHostParameters::secure_dns_mode_override
with a SecureDnsPolicy. This makes the purpose of this field
more explicit, avoids supporting the expression of policy combinations
that are not actually used, and provides a means to support new policies
that are not simply overriding the Secure DNS mode.
Blocked by Id8f3eb7e9ddefc6d35241c8843d131f79ed445ac
Bug: 1200908
Change-Id: I40f344f5972f2cb21a1196b5879475659ba2f840
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2869030
Reviewed-by: Eric Orth <[email protected]>
Commit-Queue: Eric Orth <[email protected]>
Auto-Submit: Ben Schwartz <[email protected]>
Cr-Commit-Position: refs/heads/master@{#879573}
diff --git a/net/socket/ssl_connect_job_unittest.cc b/net/socket/ssl_connect_job_unittest.cc
index 3d7cd05de..d18586d 100644
--- a/net/socket/ssl_connect_job_unittest.cc
+++ b/net/socket/ssl_connect_job_unittest.cc
@@ -24,7 +24,6 @@
#include "net/cert/ct_policy_enforcer.h"
#include "net/cert/mock_cert_verifier.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/http/http_auth_handler_factory.h"
#include "net/http/http_network_session.h"
@@ -442,12 +441,7 @@
&test_delegate, nullptr /* net_log */);
EXPECT_THAT(ssl_connect_job->Connect(), test::IsError(ERR_IO_PENDING));
- EXPECT_EQ(secure_dns_policy == SecureDnsPolicy::kDisable,
- host_resolver_.last_secure_dns_mode_override().has_value());
- if (secure_dns_policy == SecureDnsPolicy::kDisable) {
- EXPECT_EQ(net::SecureDnsMode::kOff,
- host_resolver_.last_secure_dns_mode_override().value());
- }
+ EXPECT_EQ(secure_dns_policy, host_resolver_.last_secure_dns_policy());
}
}
