diff options
| author | kmarshall <kmarshall@chromium.org> | 2015-11-23 13:27:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-23 21:28:03 +0000 |
| commit | 34957445f6f2bf3c8de2f087d4038bf05e27a030 (patch) | |
| tree | dc2025fe55c0ef7342e91a6b9f25a70562ee5596 | |
| parent | d256fd0832d4772fdea88fac6d19a940d248b5c2 (diff) | |
| download | chromium_src-34957445f6f2bf3c8de2f087d4038bf05e27a030.zip chromium_src-34957445f6f2bf3c8de2f087d4038bf05e27a030.tar.gz chromium_src-34957445f6f2bf3c8de2f087d4038bf05e27a030.tar.bz2 | |
Re-add "ip_address" field to Mac MDNS response fields.
cl/1436373002 removed this field from the response, which created
inconsistent behavior between service_discovery_client_impl.cc
and service_discovery_client_mac.mm.
Also added test expectations to catch the regression.
BUG=560448
R=vitalybuka@chromium.org
CC=wez@chromium.org
Review URL: https://codereview.chromium.org/1467393002
Cr-Commit-Position: refs/heads/master@{#361187}
| -rw-r--r-- | chrome/browser/local_discovery/service_discovery_client_mac.mm | 1 | ||||
| -rw-r--r-- | chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm index 7837234..1c7cd4a 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -352,6 +352,7 @@ void ServiceResolverImplMac::NetServiceContainer::OnResolveUpdate( if (end_point.FromSockAddr(socket, length)) { service_description_.address = net::HostPortPair::FromIPEndPoint(end_point); + service_description_.ip_address = end_point.address(); break; } } 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 dc0f20f..ccb1085 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm @@ -147,8 +147,9 @@ TEST_F(ServiceDiscoveryClientMacTest, ServiceResolver) { EXPECT_EQ(1, num_resolves_); EXPECT_EQ(2u, last_service_description_.metadata.size()); - EXPECT_EQ(kIp, last_service_description_.address.host()); + EXPECT_EQ(ip_address, last_service_description_.ip_address); EXPECT_EQ(kPort, last_service_description_.address.port()); + EXPECT_EQ(kIp, last_service_description_.address.host()); } } // namespace local_discovery |