| Index: services/http_server/http_server_factory_impl.cc
|
| diff --git a/services/http_server/http_server_factory_impl.cc b/services/http_server/http_server_factory_impl.cc
|
| index 08cb5aeaa5fd62f097c0fc6ec3efde746cacb066..d84197aae8bd05a65b8506c50b17b596afd80f72 100644
|
| --- a/services/http_server/http_server_factory_impl.cc
|
| +++ b/services/http_server/http_server_factory_impl.cc
|
| @@ -49,9 +49,9 @@ HttpServerFactoryImpl::ServerKey HttpServerFactoryImpl::GetServerKey(
|
| mojo::NetAddress* local_address) {
|
| DCHECK(local_address);
|
|
|
| - if (local_address->family == mojo::NET_ADDRESS_FAMILY_IPV6) {
|
| + if (local_address->family == mojo::NetAddressFamily::IPV6) {
|
| return ServerKey(local_address->ipv6->addr, local_address->ipv6->port);
|
| - } else if (local_address->family == mojo::NET_ADDRESS_FAMILY_IPV4) {
|
| + } else if (local_address->family == mojo::NetAddressFamily::IPV4) {
|
| return ServerKey(local_address->ipv4->addr, local_address->ipv4->port);
|
| } else {
|
| return ServerKey();
|
| @@ -63,7 +63,7 @@ void HttpServerFactoryImpl::CreateHttpServer(
|
| mojo::NetAddressPtr local_address) {
|
| if (!local_address) {
|
| local_address = mojo::NetAddress::New();
|
| - local_address->family = mojo::NET_ADDRESS_FAMILY_IPV4;
|
| + local_address->family = mojo::NetAddressFamily::IPV4;
|
| local_address->ipv4 = mojo::NetAddressIPv4::New();
|
| local_address->ipv4->addr.resize(4);
|
| local_address->ipv4->addr[0] = 0;
|
|
|