chrome/browser/local_discovery/service_discovery_client_mdns.cc - 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_mdns.cc

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

Index: chrome/browser/local_discovery/service_discovery_client_mdns.cc

diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.cc b/chrome/browser/local_discovery/service_discovery_client_mdns.cc

index d205f6588833faaa6f99866efe73850f9e8ca7f5..5367f5da4223fbbdbe0c0bfb6974a5371953de93 100644

--- a/chrome/browser/local_discovery/service_discovery_client_mdns.cc

+++ b/chrome/browser/local_discovery/service_discovery_client_mdns.cc

@@ -18,10 +18,6 @@

#include "content/public/browser/browser_thread.h"

#include "net/dns/mdns_client.h"

#include "net/udp/datagram_server_socket.h"

-namespace net {

-class IPAddress;

namespace local_discovery {

@@ -312,8 +308,8 @@

static void OnCallback(const WeakPtr& proxy,

const LocalDomainResolver::IPAddressCallback& callback,

bool a1,

- const net::IPAddress& a2,

- const net::IPAddress& a3) {

+ const net::IPAddressNumber& a2,

+ const net::IPAddressNumber& a3) {

DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));

PostToUIThread(base::Bind(&Base::RunCallback, proxy,

base::Bind(callback, a1, a2, a3)));