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

Unified Diff: content/browser/renderer_host/pepper/pepper_message_filter.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
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper/pepper_tcp_server_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/pepper/pepper_message_filter.cc
===================================================================
--- content/browser/renderer_host/pepper/pepper_message_filter.cc (revision 156377)
+++ content/browser/renderer_host/pepper/pepper_message_filter.cc (working copy)
@@ -67,6 +67,21 @@
// chrome/browser/chromeos/system/drm_settings.cc
const char kDRMIdentifierFile[] = "Pepper DRM ID.0";
+void CreateNetAddressListFromAddressList(
+ const net::AddressList& list,
+ std::vector<PP_NetAddress_Private>* net_address_list) {
+ PP_NetAddress_Private address;
+ for (size_t i = 0; i < list.size(); ++i) {
+ if (!NetAddressPrivateImpl::IPEndPointToNetAddress(list[i].address(),
+ list[i].port(),
+ &address)) {
+ net_address_list->clear();
+ return;
+ }
+ net_address_list->push_back(address);
+ }
+}
+
} // namespace
PepperMessageFilter::PepperMessageFilter(
@@ -615,9 +630,9 @@
bound_info.host_resolver_id);
} else {
const std::string& canonical_name = addresses.canonical_name();
- scoped_ptr<ppapi::NetAddressList> net_address_list(
- ppapi::CreateNetAddressListFromAddressList(addresses));
- if (!net_address_list.get()) {
+ std::vector<PP_NetAddress_Private> net_address_list;
+ CreateNetAddressListFromAddressList(addresses, &net_address_list);
+ if (net_address_list.size() == 0) {
SendHostResolverResolveACKError(bound_info.routing_id,
bound_info.plugin_dispatcher_id,
bound_info.host_resolver_id);
@@ -628,7 +643,7 @@
bound_info.host_resolver_id,
true,
canonical_name,
- *net_address_list.get()));
+ net_address_list));
}
}
}
@@ -643,7 +658,7 @@
host_resolver_id,
false,
"",
- ppapi::NetAddressList()));
+ std::vector<PP_NetAddress_Private>()));
}
void PepperMessageFilter::OnNetworkMonitorStart(uint32 plugin_dispatcher_id) {
@@ -861,7 +876,7 @@
network_copy.addresses.resize(1, NetAddressPrivateImpl::kInvalidNetAddress);
bool result = NetAddressPrivateImpl::IPEndPointToNetAddress(
- net::IPEndPoint(network.address, 0), &(network_copy.addresses[0]));
+ network.address, 0, &(network_copy.addresses[0]));
DCHECK(result);
// TODO(sergeyu): Currently net::NetworkInterfaceList provides
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper/pepper_tcp_server_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698