summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 18:12:02 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 18:12:02 +0000
commit9984ca0682185909a315ed1d2d51007b04d05126 (patch)
tree3a0d0b59e5eb7a6e7c1236014dad0f16e02dbfbf /webkit
parentf4148f30946db3e5d316e3dd411eebca3bf5649c (diff)
downloadchromium_src-9984ca0682185909a315ed1d2d51007b04d05126.zip
chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.tar.gz
chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.tar.bz2
Remove PPAPI dependency on 'net'.
This is needed to complete the port of the PPAPI proxy plugin-side to NaCl. This replaces usages in ppapi of types in 'net' with simpler base types (eg. instead of IPEndPoint, use a std::vector<unsigned char> address and an int port). Also, this removes some static methods in net_address_private_impl.* that are hardly used, and removes the ppapi::NetAddressList typedef, using std::vector<PP_NetAddress_Private> instead. BUG=116317 TEST=existing, no new functionality Review URL: https://chromiumcodereview.appspot.com/10909154 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc b/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc
index 813e98f..64691c8 100644
--- a/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc
+++ b/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc
@@ -66,7 +66,7 @@ void PPB_NetworkMonitor_Private_Impl::OnNetworkListChanged(
network.addresses.resize(
1, ::ppapi::NetAddressPrivateImpl::kInvalidNetAddress);
bool result = ::ppapi::NetAddressPrivateImpl::IPEndPointToNetAddress(
- net::IPEndPoint(list[i].address, 0), &(network.addresses[0]));
+ list[i].address, 0, &(network.addresses[0]));
DCHECK(result);
// TODO(sergeyu): Currently net::NetworkInterfaceList provides