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

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_socket.cc

Issue 10909154: Remove PPAPI dependency on 'net'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/pepper/pepper_tcp_socket.cc
===================================================================
--- content/browser/renderer_host/pepper/pepper_tcp_socket.cc (revision 156377)
+++ content/browser/renderer_host/pepper/pepper_tcp_socket.cc (working copy)
@@ -93,13 +93,19 @@
const PP_NetAddress_Private& net_addr) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ net::IPAddressNumber address;
+ int port;
if (connection_state_ != BEFORE_CONNECT ||
- !NetAddressPrivateImpl::NetAddressToAddressList(net_addr,
- &address_list_)) {
+ !NetAddressPrivateImpl::NetAddressToIPEndPoint(net_addr,
+ &address,
+ &port)) {
SendConnectACKError();
return;
}
+ // Copy the single IPEndPoint to address_list_.
+ address_list_.clear();
+ address_list_.push_back(net::IPEndPoint(address, port));
connection_state_ = CONNECT_IN_PROGRESS;
StartConnect(address_list_);
}
@@ -323,11 +329,15 @@
NetAddressPrivateImpl::kInvalidNetAddress;
if (socket_->GetLocalAddress(&ip_end_point_local) != net::OK ||
- !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_local,
- &local_addr) ||
+ !NetAddressPrivateImpl::IPEndPointToNetAddress(
+ ip_end_point_local.address(),
+ ip_end_point_local.port(),
+ &local_addr) ||
socket_->GetPeerAddress(&ip_end_point_remote) != net::OK ||
- !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_remote,
- &remote_addr)) {
+ !NetAddressPrivateImpl::IPEndPointToNetAddress(
+ ip_end_point_remote.address(),
+ ip_end_point_remote.port(),
+ &remote_addr)) {
SendConnectACKError();
connection_state_ = BEFORE_CONNECT;
} else {

Powered by Google App Engine
This is Rietveld 408576698