| Index: chrome/browser/extensions/api/socket/socket.cc
|
| diff --git a/chrome/browser/extensions/api/socket/socket.cc b/chrome/browser/extensions/api/socket/socket.cc
|
| index 37f8babe7ede2c849a62acba531888e7d50eec54..07c44ab4c40281d079e5417bf1d5439adda5649a 100644
|
| --- a/chrome/browser/extensions/api/socket/socket.cc
|
| +++ b/chrome/browser/extensions/api/socket/socket.cc
|
| @@ -78,16 +78,11 @@ void Socket::IPEndPointToStringAndPort(const net::IPEndPoint& address,
|
| int* port) {
|
| DCHECK(ip_address_str);
|
| DCHECK(port);
|
| - struct sockaddr_storage addr;
|
| - size_t addr_len = sizeof(addr);
|
| - if (address.ToSockAddr(reinterpret_cast<struct sockaddr*>(&addr),
|
| - &addr_len)) {
|
| - *ip_address_str = net::NetAddressToString(
|
| - reinterpret_cast<struct sockaddr*>(&addr), addr_len);
|
| - *port = address.port();
|
| - } else {
|
| - *ip_address_str = "";
|
| + *ip_address_str = address.ToStringWithoutPort();
|
| + if (ip_address_str->empty()) {
|
| *port = 0;
|
| + } else {
|
| + *port = address.port();
|
| }
|
| }
|
|
|
|
|