Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(826)

Unified Diff: chrome/common/local_discovery/local_domain_resolver_unittest.cc

Issue 1534583002: Migrate Local Discovery from net::IPAddressNumber to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/local_discovery/local_domain_resolver_unittest.cc
diff --git a/chrome/common/local_discovery/local_domain_resolver_unittest.cc b/chrome/common/local_discovery/local_domain_resolver_unittest.cc
index f34ff2db7d4d52f78ffe005eb3ec5c6786a20dd2..07af78aa6b3a2d8f68805f47fc6343605613bb66 100644
--- a/chrome/common/local_discovery/local_domain_resolver_unittest.cc
+++ b/chrome/common/local_discovery/local_domain_resolver_unittest.cc
@@ -67,14 +67,15 @@ class LocalDomainResolverTest : public testing::Test {
mdns_client_.StartListening(&socket_factory_);
}
- std::string IPAddressToStringWithEmpty(const net::IPAddressNumber& address) {
- if (address.empty()) return "";
- return net::IPAddressToString(address);
+ std::string IPAddressToStringWithEmpty(const net::IPAddress& address) {
+ if (!address.IsIPv4() && !address.IsIPv6())
eroman 2015/12/21 20:47:33 !IsValid()
martijnc 2016/01/27 22:50:52 Done.
+ return "";
+ return address.ToString();
}
void AddressCallback(bool resolved,
- const net::IPAddressNumber& address_ipv4,
- const net::IPAddressNumber& address_ipv6) {
+ const net::IPAddress& address_ipv4,
+ const net::IPAddress& address_ipv6) {
AddressCallbackInternal(resolved,
IPAddressToStringWithEmpty(address_ipv4),
IPAddressToStringWithEmpty(address_ipv6));

Powered by Google App Engine
This is Rietveld 408576698