| Index: ppapi/shared_impl/private/net_address_private_impl.cc
|
| diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc
|
| index b8ca4340d0a55db98f3ac42da48794cd03648ee3..35231d5cac28c8d819305840c2efff3b88dddf7f 100644
|
| --- a/ppapi/shared_impl/private/net_address_private_impl.cc
|
| +++ b/ppapi/shared_impl/private/net_address_private_impl.cc
|
| @@ -519,7 +519,7 @@ std::string NetAddressPrivateImpl::DescribeNetAddress(
|
|
|
| // static
|
| void NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv4Address(
|
| - const PP_NetAddress_IPv4_Dev& ipv4_addr,
|
| + const PP_NetAddress_IPv4& ipv4_addr,
|
| PP_NetAddress_Private* addr) {
|
| CreateFromIPv4Address(ipv4_addr.addr, ConvertFromNetEndian16(ipv4_addr.port),
|
| addr);
|
| @@ -527,14 +527,14 @@ void NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv4Address(
|
|
|
| // static
|
| void NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv6Address(
|
| - const PP_NetAddress_IPv6_Dev& ipv6_addr,
|
| + const PP_NetAddress_IPv6& ipv6_addr,
|
| PP_NetAddress_Private* addr) {
|
| CreateFromIPv6Address(ipv6_addr.addr, 0,
|
| ConvertFromNetEndian16(ipv6_addr.port), addr);
|
| }
|
|
|
| // static
|
| -PP_NetAddress_Family_Dev NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate(
|
| +PP_NetAddress_Family NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate(
|
| const PP_NetAddress_Private& addr) {
|
| const NetAddress* net_addr = ToNetAddress(&addr);
|
| if (!IsValid(net_addr))
|
| @@ -546,7 +546,7 @@ PP_NetAddress_Family_Dev NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate(
|
| // static
|
| bool NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv4Address(
|
| const PP_NetAddress_Private& addr,
|
| - PP_NetAddress_IPv4_Dev* ipv4_addr) {
|
| + PP_NetAddress_IPv4* ipv4_addr) {
|
| if (!ipv4_addr)
|
| return false;
|
|
|
| @@ -566,7 +566,7 @@ bool NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv4Address(
|
| // static
|
| bool NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv6Address(
|
| const PP_NetAddress_Private& addr,
|
| - PP_NetAddress_IPv6_Dev* ipv6_addr) {
|
| + PP_NetAddress_IPv6* ipv6_addr) {
|
| if (!ipv6_addr)
|
| return false;
|
|
|
|
|