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

Unified Diff: chrome/browser/extensions/api/mdns/dns_sd_device_lister.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/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;

Powered by Google App Engine
This is Rietveld 408576698