Add some 'Private' and 'Dev' interfaces to the NaCl IPC PPAPI Proxy.

BUG=116317
TEST=SSH extension can get interfaces.
Review URL: https://codereview.chromium.org/11078006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160673 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 35 insertions, 28 deletions

diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
index ce64356..6fab440 100644
--- a/ppapi/thunk/interfaces_ppb_private.h
+++ b/ppapi/thunk/interfaces_ppb_private.h
@@ -7,9 +7,7 @@
 
 #include "ppapi/thunk/interfaces_preamble.h"
 
-PROXIED_API(PPB_Broker)
 PROXIED_API(PPB_HostResolver_Private)
-PROXIED_API(PPB_Talk_Private)
 PROXIED_API(PPB_TCPServerSocket_Private)
 PROXIED_API(PPB_TCPSocket_Private)
 PROXIED_API(PPB_UDPSocket_Private)
@@ -17,6 +15,35 @@ PROXIED_API(PPB_X509Certificate_Private)
 UNPROXIED_API(PPB_NetworkList_Private)
 PROXIED_API(PPB_NetworkMonitor_Private)
 
+PROXIED_IFACE(PPB_HostResolver_Private, PPB_HOSTRESOLVER_PRIVATE_INTERFACE_0_1,
+              PPB_HostResolver_Private_0_1)
+PROXIED_IFACE(PPB_TCPServerSocket_Private,
+              PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1,
+              PPB_TCPServerSocket_Private_0_1)
+PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3,
+              PPB_TCPSocket_Private_0_3)
+PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_4,
+              PPB_TCPSocket_Private_0_4)
+PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2,
+              PPB_UDPSocket_Private_0_2)
+PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3,
+              PPB_UDPSocket_Private_0_3)
+PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4,
+              PPB_UDPSocket_Private_0_4)
+PROXIED_IFACE(PPB_X509Certificate_Private,
+              PPB_X509CERTIFICATE_PRIVATE_INTERFACE_0_1,
+              PPB_X509Certificate_Private_0_1)
+
+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)
+
+#if !defined(OS_NACL)
+PROXIED_API(PPB_Broker)
+PROXIED_API(PPB_Talk_Private)
+
 PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2,
               PPB_BrokerTrusted_0_2)
 PROXIED_IFACE(PPB_Instance, PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0,
@@ -35,8 +62,6 @@ PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1,
 // This uses the FileIO API which is declared in the public stable file.
 PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4,
               PPB_FileIOTrusted_0_4)
-PROXIED_IFACE(PPB_HostResolver_Private, PPB_HOSTRESOLVER_PRIVATE_INTERFACE_0_1,
-              PPB_HostResolver_Private_0_1)
 PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_0_1,
               PPB_FlashFullscreen_0_1)
 PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_1_0,
@@ -49,33 +74,12 @@ PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_1_1,
               PPB_NetAddress_Private_1_1)
 PROXIED_IFACE(PPB_Talk_Private, PPB_TALK_PRIVATE_INTERFACE_1_0,
               PPB_Talk_Private_1_0)
-PROXIED_IFACE(PPB_TCPServerSocket_Private,
-              PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1,
-              PPB_TCPServerSocket_Private_0_1)
-PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3,
-              PPB_TCPSocket_Private_0_3)
-PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_4,
-              PPB_TCPSocket_Private_0_4)
-PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2,
-              PPB_UDPSocket_Private_0_2)
-PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3,
-              PPB_UDPSocket_Private_0_3)
-PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4,
-              PPB_UDPSocket_Private_0_4)
-PROXIED_IFACE(PPB_X509Certificate_Private,
-              PPB_X509CERTIFICATE_PRIVATE_INTERFACE_0_1,
-              PPB_X509Certificate_Private_0_1)
-
-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.
 // TODO(brettw) remove support for the old Font API.
 PROXIED_IFACE(PPB_Instance, PPB_FONT_DEV_INTERFACE_0_6,
               PPB_BrowserFont_Trusted_1_0)
+#endif  // !defined(OS_NACL)
 
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 8998e24..98d3d46 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -7,6 +7,10 @@
 
 #include "ppapi/thunk/interfaces_preamble.h"
 
+PROXIED_IFACE(NoAPIName, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4,
+              PPB_CursorControl_Dev_0_4)
+
+#if !defined(OS_NACL)
 PROXIED_API(PPB_AudioInput)
 PROXIED_API(PPB_Buffer)
 UNPROXIED_API(PPB_DirectoryReader)
@@ -29,8 +33,6 @@ PROXIED_IFACE(PPB_Graphics3D,
               PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1,
               PPB_GLESChromiumTextureMapping_Dev_0_1)
 PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE_0_1, PPB_Crypto_Dev_0_1)
-PROXIED_IFACE(NoAPIName, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4,
-              PPB_CursorControl_Dev_0_4)
 PROXIED_IFACE(NoAPIName, PPB_DEVICEREF_DEV_INTERFACE_0_1, PPB_DeviceRef_Dev_0_1)
 UNPROXIED_IFACE(PPB_DirectoryReader, PPB_DIRECTORYREADER_DEV_INTERFACE_0_5,
                 PPB_DirectoryReader_Dev_0_5)
@@ -72,5 +74,6 @@ UNPROXIED_IFACE(PPB_WebSocket, PPB_WEBSOCKET_INTERFACE_1_0,
                 PPB_WebSocket_1_0)
 UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3)
 UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_4, PPB_Widget_Dev_0_4)
+#endif  // !defined(OS_NACL)
 
 #include "ppapi/thunk/interfaces_postamble.h"