chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc - Issue 1534583002: Migrate Local Discovery from net::IPAddressNumber to net::IPAddress.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« no previous file with comments | « chrome/browser/devtools/device/cast_device_provider_unittest.cc ('k') | chrome/browser/local_discovery/endpoint_resolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..204eb4b65224220a2f1667855ddc88405a4d7669 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,6 @@

#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"

using local_discovery::ServiceDescription;

@@ -17,9 +16,8 @@ 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.IsValid()) {

+ service->ip_address = service_description.ip_address.ToString();

}

service->service_data = service_description.metadata;