Chromium Code Reviews| Index: chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc |
| diff --git a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc |
| index c6c0b9c273368f75154648bdb26af10d5e0c015b..139e278019e59a4cf2df424bb3970ec4a9bf04cb 100644 |
| --- a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc |
| +++ b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc |
| @@ -5,7 +5,7 @@ |
| #include "chrome/browser/extensions/api/mdns/dns_sd_device_lister.h" |
| #include "chrome/common/extensions/api/mdns.h" |
| -#include "net/base/ip_address_number.h" |
| +#include "net/base/ip_address.h" |
| using local_discovery::ServiceDescription; |
| @@ -17,9 +17,9 @@ void FillServiceInfo(const ServiceDescription& service_description, |
| DnsSdService* service) { |
| service->service_name = service_description.service_name; |
| service->service_host_port = service_description.address.ToString(); |
| - if (!service_description.ip_address.empty()) { |
| - service->ip_address = net::IPAddressToString( |
| - service_description.ip_address); |
| + if (service_description.ip_address.IsIPv4() || |
|
eroman
2015/12/21 20:47:33
perhaps we should add a IPAddress::IsValid() metho
martijnc
2016/01/27 22:50:52
Done.
|
| + service_description.ip_address.IsIPv6()) { |
| + service->ip_address = service_description.ip_address.ToString(); |
| } |
| service->service_data = service_description.metadata; |