Migrate Local Discovery from net::IPAddressNumber to net::IPAddress.

chrome/common/local_discovery/service_discovery_client_impl.cc

Index: chrome/common/local_discovery/service_discovery_client_impl.cc
diff --git a/chrome/common/local_discovery/service_discovery_client_impl.cc b/chrome/common/local_discovery/service_discovery_client_impl.cc
index 733e1666f16dad36de74113aa653cf3a2ddfdc2e..67693b1153447b0ba241266cb8cd04414ae56f44 100644
--- a/chrome/common/local_discovery/service_discovery_client_impl.cc
+++ b/chrome/common/local_discovery/service_discovery_client_impl.cc
@@ -435,7 +435,7 @@ void ServiceResolverImpl::ARecordTransactionResponse(
     DCHECK(record);
     service_staging_.ip_address = RecordToIPAddress(record);
   } else {
-    service_staging_.ip_address = net::IPAddressNumber();
+    service_staging_.ip_address = net::IPAddress();
   }
 
   address_resolved_ = true;
@@ -493,12 +493,12 @@ net::HostPortPair ServiceResolverImpl::RecordToAddress(
   return net::HostPortPair(srv_rdata->target(), srv_rdata->port());
 }
 
-const net::IPAddressNumber& ServiceResolverImpl::RecordToIPAddress(
+const net::IPAddress ServiceResolverImpl::RecordToIPAddress(
     const net::RecordParsed* record) const {
   DCHECK(record->type() == net::dns_protocol::kTypeA);
   const net::ARecordRdata* a_rdata = record->rdata<net::ARecordRdata>();
   DCHECK(a_rdata);
-  return a_rdata->address();
+  return net::IPAddress(&a_rdata->address().front(), a_rdata->address().size());

[eroman, 2015/12/21 20:47:33]

Use a net::IPAddress(const IPAddressNumber&) constructor instead.

[martijnc, 2016/01/27 22:50:52]

Done.

 }
 
 LocalDomainResolverImpl::LocalDomainResolverImpl(
@@ -545,11 +545,13 @@ void LocalDomainResolverImpl::OnTransactionComplete(
   if (result == net::MDnsTransaction::RESULT_RECORD) {
     if (record->type() == net::dns_protocol::kTypeA) {
       const net::ARecordRdata* rdata = record->rdata<net::ARecordRdata>();
-      address_ipv4_ = rdata->address();
+      address_ipv4_ =
+          net::IPAddress(&rdata->address().front(), rdata->address().size());
     } else {
       DCHECK_EQ(net::dns_protocol::kTypeAAAA, record->type());
       const net::AAAARecordRdata* rdata = record->rdata<net::AAAARecordRdata>();
-      address_ipv6_ = rdata->address();
+      address_ipv6_ =
+          net::IPAddress(&rdata->address().front(), rdata->address().size());
     }
   }
 
@@ -569,7 +571,7 @@ void LocalDomainResolverImpl::OnTransactionComplete(
 }
 
 bool LocalDomainResolverImpl::IsSuccess() {
-  return !address_ipv4_.empty() || !address_ipv6_.empty();
+  return address_ipv4_.IsIPv4() || address_ipv6_.IsIPv6();
 }
 
 void LocalDomainResolverImpl::SendResolvedAddresses() {