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

Unified Diff: chrome/browser/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: fix builders Created 4 years, 11 months 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/browser/local_discovery/local_domain_resolver_unittest.cc
diff --git a/chrome/browser/local_discovery/local_domain_resolver_unittest.cc b/chrome/browser/local_discovery/local_domain_resolver_unittest.cc
index 9417e8159db879de2b532abcaa777eb4c4345d18..4c2a4c197b3799f3f0b3b6e18913c1505be6e081 100644
--- a/chrome/browser/local_discovery/local_domain_resolver_unittest.cc
+++ b/chrome/browser/local_discovery/local_domain_resolver_unittest.cc
@@ -69,17 +69,18 @@ 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 IPAddressToStringWithInvalid(const net::IPAddress& address) {
+ if (!address.IsValid())
+ return "";
+ return address.ToString();
}
void AddressCallback(bool resolved,
- const net::IPAddressNumber& address_ipv4,
- const net::IPAddressNumber& address_ipv6) {
- AddressCallbackInternal(resolved,
- IPAddressToStringWithEmpty(address_ipv4),
- IPAddressToStringWithEmpty(address_ipv6));
+ const net::IPAddress& address_ipv4,
+ const net::IPAddress& address_ipv6) {
+ AddressCallbackInternal(resolved,
+ IPAddressToStringWithInvalid(address_ipv4),
+ IPAddressToStringWithInvalid(address_ipv6));
}
void RunFor(base::TimeDelta time_period) {
« no previous file with comments | « chrome/browser/local_discovery/endpoint_resolver.cc ('k') | chrome/browser/local_discovery/service_discovery_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698