summaryrefslogtreecommitdiffstats
path: root/net/dns/dns_transaction_unittest.cc
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-11 00:02:55 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-11 00:02:55 +0000
commitb724f3786865dfced66d18f52f0db08c17d38ebc (patch)
tree23e1ca8d9c5fbb662d53407e10ab318187332f79 /net/dns/dns_transaction_unittest.cc
parent994df2e780b0cbb56dbb3b5ef67f0f36cbf4a715 (diff)
downloadchromium_src-b724f3786865dfced66d18f52f0db08c17d38ebc.zip
chromium_src-b724f3786865dfced66d18f52f0db08c17d38ebc.tar.gz
chromium_src-b724f3786865dfced66d18f52f0db08c17d38ebc.tar.bz2
[net/dns] Fixes to DnsConfigServiceWin
Reject empty string16 early to avoid exception when converting to string. Default to 53, if port is not set. Fix CreateAdapterAddresses for the case there is more than one address. BUG=113692, 113693 TEST=./net_unittest --gtest_filter=DnsConfigService* Review URL: http://codereview.chromium.org/9384009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns/dns_transaction_unittest.cc')
-rw-r--r--net/dns/dns_transaction_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index d3eadb9..8e0888a 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -205,7 +205,8 @@ class DnsTransactionTest : public testing::Test {
}
for (unsigned i = 0; i < num_servers; ++i) {
dns_ip[3] = i;
- config_.nameservers.push_back(IPEndPoint(dns_ip, kDnsPort));
+ config_.nameservers.push_back(IPEndPoint(dns_ip,
+ dns_protocol::kDefaultPort));
}
}