Use PP_ArrayOutput and PPB_NetAddress in PPB_NetworkList_Private..

ppapi/cpp/private/network_list_private.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/cpp/private/network_list_private.h"
 
+#include "ppapi/cpp/array_output.h"
+#include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module_impl.h"
+#include "ppapi/cpp/net_address.h"
 #include "ppapi/cpp/var.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_NetworkList_Private>() {

[yzshen1, 2013/09/03 17:47:32]

nit: It is preferred to append the version name explicitly. (here and all
get_interface calls below.)

[Sergey Ulanov, 2013/09/03 23:42:54]

Done.

   return PPB_NETWORKLIST_PRIVATE_INTERFACE;

[yzshen1, 2013/09/03 17:47:32]

ditto.

[Sergey Ulanov, 2013/09/03 23:42:54]

Done.

 }
 
+// Used in GetIpAddresses().

[yzshen1, 2013/09/03 17:47:32]

maybe this could be removed?

[Sergey Ulanov, 2013/09/03 23:42:54]

Yes. I added it before I found ResourceArrayOutputAdapter.

+struct ResourceArray {
+  PP_Resource* resources;
+  int count;
+};
+
+void* AllocateResourceArray(void* data, uint32_t count, uint32_t size) {
+  ResourceArray* resource_array = reinterpret_cast<ResourceArray*>(data);
+  PP_DCHECK(size == sizeof(PP_Resource));
+  if (size) {
+    resource_array->resources = new PP_Resource[count];
+    if (resource_array->resources)
+      resource_array->count = count;
+  } else {
+    resource_array->resources = NULL;
+  }
+  return resource_array->resources;
+}
+
 }  // namespace
 
 NetworkListPrivate::NetworkListPrivate() {
 }
 
 NetworkListPrivate::NetworkListPrivate(PassRef, PP_Resource resource)
     : Resource(PASS_REF, resource) {
 }
 
 // static
@@ skipping 25 matching lines @@
 
 PP_NetworkListState_Private NetworkListPrivate::GetState(uint32_t index) const {
   if (!has_interface<PPB_NetworkList_Private>())
     return PP_NETWORKLIST_DOWN;
   return get_interface<PPB_NetworkList_Private>()->GetState(
       pp_resource(), index);
 }
 
 void NetworkListPrivate::GetIpAddresses(
     uint32_t index,
-    std::vector<PP_NetAddress_Private>* addresses) const {
+    std::vector<NetAddress>* addresses) const {
   if (!has_interface<PPB_NetworkList_Private>())
     return;
 

[yzshen1, 2013/09/03 17:47:32]

nit: check NULL for |addresses|?

[Sergey Ulanov, 2013/09/03 23:42:54]

Done.

-  // Most network interfaces don't have more than 3 network
-  // interfaces.
-  addresses->resize(3);
-
-  int32_t result = get_interface<PPB_NetworkList_Private>()->GetIpAddresses(
-      pp_resource(), index, &addresses->front(), addresses->size());
-
-  if (result < 0) {
-    addresses->resize(0);
-    return;
-  }
-
-  if (result <= static_cast<int32_t>(addresses->size())) {
-    addresses->resize(result);
-    return;
-  }
-
-  addresses->resize(result);
-  result = get_interface<PPB_NetworkList_Private>()->GetIpAddresses(
-      pp_resource(), index, &addresses->front(), addresses->size());
-  if (result < 0) {
-    addresses->resize(0);
-  } else if (result < static_cast<int32_t>(addresses->size())) {
-    addresses->resize(result);
-  }
+  ResourceArrayOutputAdapter<NetAddress> adapter(addresses);
+  get_interface<PPB_NetworkList_Private>()->GetIpAddresses(
+      pp_resource(), index, adapter.pp_array_output());
 }
 
 std::string NetworkListPrivate::GetDisplayName(uint32_t index) const {
   if (!has_interface<PPB_NetworkList_Private>())
     return std::string();
   Var result(PASS_REF,
              get_interface<PPB_NetworkList_Private>()->GetDisplayName(
                  pp_resource(), index));
   return result.is_string() ? result.AsString() : std::string();
 }
 
 uint32_t NetworkListPrivate::GetMTU(uint32_t index) const {
   if (!has_interface<PPB_NetworkList_Private>())
     return 0;
-  return get_interface<PPB_NetworkList_Private>()->GetMTU(
-      pp_resource(), index);
+  return get_interface<PPB_NetworkList_Private>()->GetMTU(pp_resource(), index);
 }
 
 }  // namespace pp