Merge IPEndPoint lists in HostResolver results
Turns out a single combined list is better for our needs for current
connection logic and Happy Eyeballs v1 (v2 out of scope).
Bug: 1264933
Change-Id: Ib7a79c564160efd0b91bbc941d37fce380181fbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3299010
Reviewed-by: David Benjamin <[email protected]>
Commit-Queue: Eric Orth <[email protected]>
Cr-Commit-Position: refs/heads/main@{#947562}
diff --git a/net/dns/host_resolver_results.h b/net/dns/host_resolver_results.h
index 5e784c8..602cf02 100644
--- a/net/dns/host_resolver_results.h
+++ b/net/dns/host_resolver_results.h
@@ -26,16 +26,13 @@
HostResolverEndpointResult(HostResolverEndpointResult&&);
HostResolverEndpointResult& operator=(HostResolverEndpointResult&&) = default;
- // IPv4 endpoints at which to connect to the service.
- std::vector<net::IPEndPoint> ipv4_endpoints;
+ // IP endpoints at which to connect to the service.
+ std::vector<net::IPEndPoint> ip_endpoints;
// The final name in the alias chain (DNS CNAME or HTTPS) at which the
// IPv4 addresses were found.
std::string ipv4_alias_name;
- // IPv6 endpoints at which to connect to the service.
- std::vector<net::IPEndPoint> ipv6_endpoints;
-
// The final name in the alias chain (DNS CNAME or HTTPS) at which the
// IPv6 addresses were found.
std::string ipv6_alias_name;