| Index: ppapi/shared_impl/private/ppb_host_resolver_shared.cc
|
| ===================================================================
|
| --- ppapi/shared_impl/private/ppb_host_resolver_shared.cc (revision 156377)
|
| +++ ppapi/shared_impl/private/ppb_host_resolver_shared.cc (working copy)
|
| @@ -8,9 +8,6 @@
|
| #include <cstring>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#if !defined(OS_NACL)
|
| -#include "net/base/address_list.h"
|
| -#endif
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/shared_impl/private/net_address_private_impl.h"
|
| #include "ppapi/shared_impl/var.h"
|
| @@ -18,22 +15,6 @@
|
|
|
| namespace ppapi {
|
|
|
| -#if !defined(OS_NACL) && !defined(NACL_WIN64)
|
| -NetAddressList* CreateNetAddressListFromAddressList(
|
| - const net::AddressList& list) {
|
| - scoped_ptr<NetAddressList> net_address_list(new NetAddressList());
|
| - PP_NetAddress_Private address;
|
| -
|
| - for (size_t i = 0; i < list.size(); ++i) {
|
| - if (!NetAddressPrivateImpl::IPEndPointToNetAddress(list[i], &address))
|
| - return NULL;
|
| - net_address_list->push_back(address);
|
| - }
|
| -
|
| - return net_address_list.release();
|
| -}
|
| -#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
|
| -
|
| PPB_HostResolver_Shared::PPB_HostResolver_Shared(PP_Instance instance)
|
| : Resource(OBJECT_IS_IMPL, instance),
|
| host_resolver_id_(GenerateHostResolverID()) {
|
| @@ -94,7 +75,7 @@
|
| void PPB_HostResolver_Shared::OnResolveCompleted(
|
| bool succeeded,
|
| const std::string& canonical_name,
|
| - const NetAddressList& net_address_list) {
|
| + const std::vector<PP_NetAddress_Private>& net_address_list) {
|
| if (succeeded) {
|
| canonical_name_ = canonical_name;
|
| net_address_list_ = net_address_list;
|
|
|