summaryrefslogtreecommitdiff
path: root/chromium/net/socket/socks_connect_job_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 17:21:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 16:25:15 +0000
commitc551f43206405019121bd2b2c93714319a0a3300 (patch)
tree1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/net/socket/socks_connect_job_unittest.cc
parent7961cea6d1041e3e454dae6a1da660b453efd238 (diff)
downloadqtwebengine-chromium-c551f43206405019121bd2b2c93714319a0a3300.tar.gz
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/socket/socks_connect_job_unittest.cc')
-rw-r--r--chromium/net/socket/socks_connect_job_unittest.cc22
1 files changed, 20 insertions, 2 deletions
diff --git a/chromium/net/socket/socks_connect_job_unittest.cc b/chromium/net/socket/socks_connect_job_unittest.cc
index 53ca3ba4bd3..7ad2fc2d238 100644
--- a/chromium/net/socket/socks_connect_job_unittest.cc
+++ b/chromium/net/socket/socks_connect_job_unittest.cc
@@ -65,10 +65,11 @@ class SOCKSConnectJobTest : public testing::Test, public WithTaskEnvironment {
~SOCKSConnectJobTest() override {}
static scoped_refptr<SOCKSSocketParams> CreateSOCKSParams(
- SOCKSVersion socks_version) {
+ SOCKSVersion socks_version,
+ bool disable_secure_dns = false) {
return base::MakeRefCounted<SOCKSSocketParams>(
base::MakeRefCounted<TransportSocketParams>(
- HostPortPair(kProxyHostName, kProxyPort),
+ HostPortPair(kProxyHostName, kProxyPort), disable_secure_dns,
OnHostResolutionCallback()),
socks_version == SOCKSVersion::V5,
socks_version == SOCKSVersion::V4
@@ -346,6 +347,23 @@ TEST_F(SOCKSConnectJobTest, Priority) {
}
}
+TEST_F(SOCKSConnectJobTest, DisableSecureDns) {
+ for (bool disable_secure_dns : {false, true}) {
+ TestConnectJobDelegate test_delegate;
+ SOCKSConnectJob socks_connect_job(
+ DEFAULT_PRIORITY, SocketTag(), &common_connect_job_params_,
+ CreateSOCKSParams(SOCKSVersion::V4, disable_secure_dns), &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::DnsConfig::SecureDnsMode::OFF,
+ host_resolver_.last_secure_dns_mode_override().value());
+ }
+ }
+}
+
TEST_F(SOCKSConnectJobTest, ConnectTiming) {
host_resolver_.set_ondemand_mode(true);