chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm - 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/local_discovery/service_discovery_client_mac_unittest.mm

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/browser/local_discovery/service_discovery_client_mac.mm ('K') | « chrome/browser/local_discovery/service_discovery_client_mac.mm ('k') | chrome/browser/local_discovery/service_discovery_client_mdns.cc » ('j') | chrome/common/local_discovery/local_domain_resolver_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm

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

index ccb10856674e990e14c88c2cb8c5f0f9833a4bd9..2dc08de3fc5aeebab38026377dc00a2b325ab00a 100644

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

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

@@ -11,6 +11,7 @@

#include "chrome/browser/local_discovery/service_discovery_client_mac.h"

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

#include "content/public/test/test_browser_thread_bundle.h"

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

#include "net/base/ip_endpoint.h"

#include "net/base/net_util.h"

#include "testing/gtest_mac.h"

@@ -125,8 +126,8 @@ TEST_F(ServiceDiscoveryClientMacTest, ServiceResolver) {

const std::string kIp = "2001:4860:4860::8844";

const uint16_t kPort = 4321;

- net::IPAddressNumber ip_address;

- ASSERT_TRUE(net::ParseIPLiteralToNumber(kIp, &ip_address));

+ net::IPAddress ip_address;

+ ASSERT_TRUE(net::IPAddress::FromIPLiteral(kIp, &ip_address));

net::IPEndPoint endpoint(ip_address, kPort);

net::SockaddrStorage storage;

ASSERT_TRUE(endpoint.ToSockAddr(storage.addr, &storage.addr_len));