2 files changed, 17 insertions, 5 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
index 43776b0..f6cec07 100644
--- a/ppapi/thunk/interfaces_ppb_private.h
+++ b/ppapi/thunk/interfaces_ppb_private.h
@@ -13,6 +13,8 @@ PROXIED_API(PPB_Talk_Private)
 PROXIED_API(PPB_TCPServerSocket_Private)
 PROXIED_API(PPB_TCPSocket_Private)
 PROXIED_API(PPB_UDPSocket_Private)
+UNPROXIED_API(PPB_NetworkList_Private)
+PROXIED_API(PPB_NetworkMonitor_Private)
 
 PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2,
               PPB_BrokerTrusted_0_2)
@@ -45,11 +47,11 @@ PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2,
 PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3,
               PPB_UDPSocket_Private_0_3)
 
-UNPROXIED_IFACE(PPB_NetworkList_Private, PPB_NETWORKLIST_PRIVATE_INTERFACE_0_2,
-                PPB_NetworkList_Private_0_2)
-UNPROXIED_IFACE(PPB_NetworkMonitor_Private,
-                PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_2,
-                PPB_NetworkMonitor_Private_0_2)
+PROXIED_IFACE(NoAPIName, PPB_NETWORKLIST_PRIVATE_INTERFACE_0_2,
+              PPB_NetworkList_Private_0_2)
+PROXIED_IFACE(PPB_NetworkMonitor_Private,
+              PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_2,
+              PPB_NetworkMonitor_Private_0_2)
 
 // Hack to keep font working. The Font 0.6 API is binary compatible with
 // BrowserFont 1.0, so just map the string to the same thing.
diff --git a/ppapi/thunk/ppb_network_list_private_api.h b/ppapi/thunk/ppb_network_list_private_api.h
index fbe57f0..ea91349 100644
--- a/ppapi/thunk/ppb_network_list_private_api.h
+++ b/ppapi/thunk/ppb_network_list_private_api.h
@@ -5,16 +5,26 @@
 #ifndef PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_
 #define PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_
 
+#include <vector>
+
 #include "ppapi/c/private/ppb_network_list_private.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
+
+struct NetworkInfo;
+typedef std::vector<NetworkInfo> NetworkList;
+
 namespace thunk {
 
 class PPAPI_THUNK_EXPORT PPB_NetworkList_Private_API {
  public:
   virtual ~PPB_NetworkList_Private_API() {}
 
+  // This function is not exposed through the C API, but returns the
+  // internal data for easy proxying.
+  virtual const NetworkList& GetNetworkListData() const = 0;
+
   virtual uint32_t GetCount() = 0;
   virtual PP_Var GetName(uint32_t index) = 0;
   virtual PP_NetworkListType_Private GetType(uint32_t index) = 0;