chrome/browser/local_discovery/service_discovery_client_mac.mm - Issue 1653573003: Revert of 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/local_discovery/service_discovery_client_mac.mm

Issue 1653573003: Revert of Migrate Local Discovery from net::IPAddressNumber to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/local_discovery/service_discovery_client_impl.cc ('k') | chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/local_discovery/service_discovery_client_mac.mm

diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm

index 0aaaf2d7ea1ccc5141297e3f43825f1e312ca41c..859a96a6156895c16b3fbccda90712eb8a0813b8 100644

--- a/chrome/browser/local_discovery/service_discovery_client_mac.mm

+++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm

@@ -16,7 +16,7 @@

#include "base/single_thread_task_runner.h"

#include "base/thread_task_runner_handle.h"

#include "base/threading/thread.h"

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

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

#include "net/base/ip_endpoint.h"

using local_discovery::ServiceWatcherImplMac;

@@ -354,7 +354,7 @@

if (end_point.FromSockAddr(socket, length)) {

service_description_.address =

net::HostPortPair::FromIPEndPoint(end_point);

- service_description_.ip_address = end_point.address();

+ service_description_.ip_address = end_point.address().bytes();

break;

}