chrome/utility/local_discovery/service_discovery_message_handler.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/utility/local_discovery/service_discovery_message_handler.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

« chrome/common/local_discovery/service_discovery_client_unittest.cc ('K') | « chrome/utility/local_discovery/service_discovery_message_handler.h ('k') | content/public/common/common_param_traits.h » ('j') | content/public/common/common_param_traits.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/utility/local_discovery/service_discovery_message_handler.cc

diff --git a/chrome/utility/local_discovery/service_discovery_message_handler.cc b/chrome/utility/local_discovery/service_discovery_message_handler.cc

index 957d6190e2ded1d9ed1b4b36deacb952b23003cd..8667c32eb86b8dc195940fe95bff986de90a11aa 100644

--- a/chrome/utility/local_discovery/service_discovery_message_handler.cc

+++ b/chrome/utility/local_discovery/service_discovery_message_handler.cc

@@ -14,7 +14,7 @@

#include "chrome/common/local_discovery/local_discovery_messages.h"

#include "chrome/common/local_discovery/service_discovery_client_impl.h"

#include "content/public/utility/utility_thread.h"

-#include "net/base/net_util.h"

+#include "net/base/ip_address.h"

#include "net/socket/socket_descriptor.h"

#include "net/udp/datagram_server_socket.h"

@@ -462,13 +462,12 @@ void ServiceDiscoveryMessageHandler::OnServiceResolved(

void ServiceDiscoveryMessageHandler::OnLocalDomainResolved(

uint64 id,

bool success,

- const net::IPAddressNumber& address_ipv4,

- const net::IPAddressNumber& address_ipv6) {

+ const net::IPAddress& address_ipv4,

+ const net::IPAddress& address_ipv6) {

VLOG(1) << "OnLocalDomainResolved, id=" << id

- << ", IPv4=" << (address_ipv4.empty() ? "" :

- net::IPAddressToString(address_ipv4))

- << ", IPv6=" << (address_ipv6.empty() ? "" :

- net::IPAddressToString(address_ipv6));

+ << ", IPv4=" << (address_ipv4.IsIPv4() ? address_ipv4.ToString() : "")

eroman 2015/12/21 20:47:33 This is not a direct translation. Prefer to use an

martijnc 2016/01/27 22:50:52 (This code has been removed.)

+ << ", IPv6="

+ << (address_ipv6.IsIPv6() ? address_ipv6.ToString() : "");

DCHECK(service_discovery_client_);

Send(new LocalDiscoveryHostMsg_LocalDomainResolverCallback(