Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/p2p/socket_host_tcp.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index cd93a1293707231ecb120cd0ae7c12ee0ee3f066..e3f08f7cfc20a94f234c405338456f234c84ae40 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -97,7 +97,7 @@ bool P2PSocketHostTcpBase::Init(const net::IPEndPoint& local_address,
dest_host_port_pair = net::HostPortPair(remote_address.hostname,
remote_address.ip_address.port());
} else {
- DCHECK(!remote_address.ip_address.address().empty());
+ DCHECK(!remote_address.ip_address.address_number().empty());
dest_host_port_pair = net::HostPortPair::FromIPEndPoint(
remote_address.ip_address);
}
@@ -196,7 +196,7 @@ void P2PSocketHostTcpBase::StartTls() {
// Calling net::HostPortPair::FromIPEndPoint will crash if the IP address is
// empty.
- if (!remote_address_.ip_address.address().empty()) {
+ if (!remote_address_.ip_address.address_number().empty()) {
net::HostPortPair::FromIPEndPoint(remote_address_.ip_address);
} else {
dest_host_port_pair.set_port(remote_address_.ip_address.port());
@@ -276,9 +276,9 @@ bool P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
return false;
}
- if (!remote_address.address().empty()) {
+ if (!remote_address.address_number().empty()) {
VLOG(1) << "Remote address: " << remote_address.ToString();
- if (remote_address_.ip_address.address().empty()) {
+ if (remote_address_.ip_address.address_number().empty()) {
// Save |remote_address| if address is empty.
remote_address_.ip_address = remote_address;
}

Powered by Google App Engine
This is Rietveld 408576698